Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse source 
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
This commit is contained in:
David Yip 2018-05-03 17:23:44 -05:00
commit c816701550
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
437 changed files with 5999 additions and 1848 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
View file

@ -14,7 +14,7 @@ describe Api::V1::Accounts::CredentialsController do
describe 'GET #show' do
it 'returns http success' do
get :show
expect(response).to have_http_status(:success)
expect(response).to have_http_status(200)
end
end
@ -36,7 +36,7 @@ describe Api::V1::Accounts::CredentialsController do
end
it 'returns http success' do
expect(response).to have_http_status(:success)
expect(response).to have_http_status(200)
end
it 'updates account info' do