Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
This commit is contained in:
Thibaut Girka 2018-10-05 15:23:57 +02:00
commit 00fcdebed7
93 changed files with 406 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/controllers/application_controller_spec.rb
View file

@ -201,7 +201,7 @@ describe ApplicationController, type: :controller do
describe 'raise_not_found' do
it 'raises error' do
controller.params[:unmatched_route] = 'unmatched'
expect{ controller.raise_not_found }.to raise_error(ActionController::RoutingError, 'No route matches unmatched')
expect { controller.raise_not_found }.to raise_error(ActionController::RoutingError, 'No route matches unmatched')
end
end