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

Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml

2018-08-27 18:09:28 +02:00

..

environments

Move CSP headers to the appropriate Rails configuration

2018-08-22 20:39:33 +02:00

initializers

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

2018-08-26 14:23:24 +02:00

locales

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

2018-08-27 18:09:28 +02:00

webpack

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

2018-08-26 14:23:24 +02:00

application.rb

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

2018-08-18 18:04:49 +02:00

boot.rb

…

brakeman.ignore

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

Ignore tootsuite-specific theme-related translation strings

2018-05-10 00:03:34 +02:00

navigation.rb

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

2018-07-17 22:05:25 +02:00

puma.rb

Revert "Default puma to running on localhost only." (#8444)

2018-08-26 00:13:22 +02:00

routes.rb

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

2018-08-24 15:10:34 +02:00

secrets.yml

…

settings.yml

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

2018-08-01 22:20:25 +02:00

sidekiq.yml

…

webpacker.yml

…