Claire ec3e2b8f72 Merge branch 'master' into glitch-soc/merge-upstream

2020-12-19 14:52:09 +01:00

..

environments

Merge branch 'master' into glitch-soc/merge-upstream

2020-07-15 15:32:40 +02:00

initializers

Merge branch 'master' into glitch-soc/merge-upstream

2020-12-15 14:27:06 +01:00

locales

Ran i18n-tasks normalize (#15372)

2020-12-19 02:23:42 +01:00

locales-glitch

Glitchsoc translation to 'es' language (#1439)

2020-10-19 22:17:29 +02:00

webpack

Merge branch 'master' into glitch-soc/merge-upstream

2020-11-07 18:23:02 +01:00

application.rb

Fix streaming API allowing connections to persist after access token invalidation (#15111)

2020-11-12 23:05:24 +01:00

boot.rb

…

brakeman.ignore

Fix performance on instances list in admin UI (#15282)

2020-12-14 09:06:34 +01:00

database.yml

…

deploy.rb

Bump capistrano from 3.14.0 to 3.14.1 (#14037)

2020-06-17 06:31:30 +02:00

environment.rb

…

i18n-tasks.yml

Merge branch 'master' into glitch-soc/merge-upstream

2020-07-01 19:23:14 +02:00

navigation.rb

Merge branch 'master' into glitch-soc/merge-upstream

2020-10-21 19:10:50 +02:00

pghero.yml

Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)

2020-05-04 13:52:41 +02:00

puma.rb

…

routes.rb

Merge branch 'master' into glitch-soc/merge-upstream

2020-11-20 13:27:48 +01:00

secrets.yml

…

settings.yml

Merge branch 'master' into glitch-soc/merge-upstream

2020-12-15 14:27:06 +01:00

sidekiq.yml

Fix to isolate the sidekiq process that runs the scheduler job (#15314)

2020-12-15 03:04:03 +01:00

webpacker.yml

…