Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml

2019-06-26 23:19:22 +02:00

..

environments

…

initializers

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

2019-06-24 15:02:59 +02:00

locales

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

2019-06-26 23:19:22 +02:00

webpack

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

2019-06-04 20:40:19 +02:00

application.rb

Fix converted media being saved with original extension and mime type (#11130)

2019-06-20 10:52:36 +02: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

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

2019-06-10 18:59:53 +02:00

navigation.rb

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

2019-06-10 18:59:53 +02:00

puma.rb

…

routes.rb

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

2019-06-24 15:02:59 +02:00

secrets.yml

…

settings.yml

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

2019-06-26 23:19:22 +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