Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

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

..

activitypub

…

admin

Add tests for admin/roles_controller (#7421)

2018-05-09 08:41:46 +02:00

api

…

auth

…

concerns

…

oauth

…

settings

…

well_known

…

about_controller_spec.rb

…

account_follow_controller_spec.rb

…

account_unfollow_controller_spec.rb

…

accounts_controller_spec.rb

…

application_controller_spec.rb

…

authorize_follows_controller_spec.rb

…

follower_accounts_controller_spec.rb

…

following_accounts_controller_spec.rb

…

home_controller_spec.rb

…

manifests_controller_spec.rb

…

media_controller_spec.rb

…

remote_follow_controller_spec.rb

…

statuses_controller_spec.rb

…

stream_entries_controller_spec.rb

…

tags_controller_spec.rb

…