Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream ...

Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock

2019-06-03 14:54:30 +02:00

..

environments

…

initializers

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

2019-05-28 17:45:06 +02:00

locales

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

2019-06-03 14:54:30 +02:00

webpack

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

2019-06-03 14:54:30 +02:00

application.rb

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

2019-03-20 13:54:00 +01:00

boot.rb

…

brakeman.ignore

…

database.yml

config: add DB_SSLMODE for managed/remote PG (#10210)

2019-03-08 14:36:28 +01:00

deploy.rb

…

environment.rb

…

i18n-tasks.yml

…

navigation.rb

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

2019-04-10 09:16:08 +02:00

puma.rb

…

routes.rb

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

2019-04-10 09:16:08 +02:00

secrets.yml

…

settings.yml

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

2019-06-03 14:54:30 +02:00

sidekiq.yml

…

webpacker.yml

Do not try to parse gif files as CSS or JS

2019-03-16 14:23:50 +01:00