Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.

2020-12-10 09:41:49 +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-11-20 13:27:48 +01:00

locales

Add honeypot fields and minimum fill-out time for sign-up form (#15276)

2020-12-10 06:27:26 +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

…

database.yml

…

deploy.rb

…

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

…

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-10-21 19:10:50 +02:00

sidekiq.yml

…

webpacker.yml

…