mastodon/app
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream
Manually-resolved conflicts:
	.circleci/config.yml
	app/controllers/accounts_controller.rb
	app/controllers/auth/passwords_controller.rb
	app/controllers/statuses_controller.rb
	app/javascript/packs/public.js
	app/models/media_attachment.rb
	app/views/stream_entries/_content_spoiler.html.haml
	app/views/stream_entries/_media.html.haml
	config/locales/en.yml
	config/locales/ja.yml
	config/locales/pl.yml
	lib/mastodon/version.rb

Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.

Translation strings for glitch-soc's keyword mutes were dropped.

Everything else was mostly “take both”.
2018-08-01 00:18:13 +02:00
..
chewy Full-text search for authorized statuses (#6423) 2018-02-09 23:04:47 +01:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
mailers Account archive download (#6460) 2018-02-21 23:21:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
policies Disallow remote users from viewing local-only toots 2018-07-31 15:41:04 +02:00
presenters Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-04 18:17:32 +00:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2018-07-26 21:22:43 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
workers Fix ActivityPub::UpdateDistributionWorker regression (#8039) 2018-07-16 18:43:22 +02:00