David Yip 48d79007f6 Merge remote-tracking branch 'origin/master' into merge-upstream-20180121

2018-01-21 16:26:50 -06:00

..

environments

tighten csp

2018-01-06 18:49:03 +00:00

initializers

Merge remote-tracking branch 'origin/master' into gs-master

2018-01-15 22:17:48 -06:00

locales

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-20 10:45:43 -06:00

webpack

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-21 13:36:10 -06:00

application.rb

Merge remote-tracking branch 'origin/master' into merge-upstream-20180121

2018-01-21 16:26:50 -06:00

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

Remove themes.default from i18n-tasks unused check

2017-12-21 05:24:17 -06:00

navigation.rb

Moved flavour UI into own prefs tab

2017-12-10 20:32:27 -08:00

puma.rb

…

routes.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-08 10:17:15 +00:00

secrets.yml

…

settings.yml

Merge remote-tracking branch 'origin/master' into merge-upstream

2017-12-30 17:20:07 -06:00

sidekiq.yml

Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)

2018-01-15 04:34:28 +01:00

webpacker.yml

…