tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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”.
This commit is contained in:
Thibaut Girka
2018-07-31 22:21:15 +02:00
parent 88b593a63f 13ac8ca66a
commit c1c514ca70
187 changed files with 3356 additions and 2009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spec/controllers/about_controller_spec.rb
View File

@ -8,10 +8,6 @@ RSpec.describe AboutController, type: :controller do
get :show
end
it 'assigns @body_classes' do
expect(assigns(:body_classes)).to eq 'about-body'
end
it 'assigns @instance_presenter' do
expect(assigns(:instance_presenter)).to be_kind_of InstancePresenter
end
@ -26,10 +22,6 @@ RSpec.describe AboutController, type: :controller do
get :more
end
it 'assigns @body_classes' do
expect(assigns(:body_classes)).to eq 'about-body'
end
it 'assigns @instance_presenter' do
expect(assigns(:instance_presenter)).to be_kind_of InstancePresenter
end
@ -44,10 +36,6 @@ RSpec.describe AboutController, type: :controller do
get :terms
end
it 'assigns @body_classes' do
expect(assigns(:body_classes)).to eq 'about-body'
end
it 'returns http success' do
expect(response).to have_http_status(200)
end