Thibaut Girka 06cc04fd23 Merge branch 'master' into glitch-soc/merge-upstream

2019-02-15 18:02:45 +01:00

..

environments

…

initializers

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

2019-02-15 18:02:45 +01:00

locales

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

2019-02-15 18:02:45 +01:00

webpack

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

2019-01-02 15:36:53 +01:00

application.rb

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

2019-02-12 20:32:48 +01:00

boot.rb

…

brakeman.ignore

…

database.yml

Remove PostgreSQL statement timeout (#9537)

2018-12-16 21:17:15 +01:00

deploy.rb

Use the bundled Capistrano version (#9855)

2019-01-18 21:31:11 +01:00

environment.rb

…

i18n-tasks.yml

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

2019-02-10 21:10:09 +01:00

navigation.rb

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

2019-02-10 21:10:09 +01:00

puma.rb

…

routes.rb

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

2019-02-10 21:10:09 +01:00

secrets.yml

…

settings.yml

Enable "displaying application used to post" setting by default (#9994)

2019-02-09 17:33:41 +01:00

sidekiq.yml

Add scheduled statuses (#9706)

2019-01-05 12:43:28 +01:00

webpacker.yml

…