David Yip 071c2c9c85 Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	app/javascript/styles/mastodon/components.scss

2018-01-20 10:45:43 -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-20 10:45:43 -06:00

application.rb

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

2018-01-19 15:22:10 -06:00

boot.rb

…

brakeman.ignore

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

database.yml

use-DB_NAME-in-development (#5430)

2017-10-17 11:45:37 +02:00

deploy.rb

Update dependencies for Ruby (2017-10-30) (#5566)

2017-10-31 12:22:32 +01:00

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

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00