Thibaut Girka 83f8bf48d9 Merge branch 'master' into glitch-soc/merge-upstream

2020-01-13 13:14:35 +01:00

..

environments

…

initializers

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

2020-01-12 15:57:34 +01:00

locales

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

2020-01-13 13:14:35 +01:00

webpack

Revert CircleCI and some webpack changes to match upstream

2019-11-20 18:05:24 +01:00

application.rb

Fix uncaught query param encoding errors (#12741)

2020-01-02 17:14:58 +01:00

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

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

2019-11-20 15:36:09 +01:00

navigation.rb

…

pghero.yml

Use override_csp options on pghero (#12489)

2019-11-27 05:28:11 +01:00

puma.rb

…

routes.rb

Add bookmarks (#7107)

2019-11-13 23:02:10 +01:00

secrets.yml

…

settings.yml

Merge branch 'master' into glitch-soc/master

2019-12-19 13:52:54 +01:00

sidekiq.yml

…

webpacker.yml

…