David Yip 16d5217502 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json		2018-04-18 18:48:12 -05:00
..
activitypub	Revert #5772 (#6221)	2018-01-08 10:57:52 +01:00
admin	Feature: Allow staff to change user emails (#7074)	2018-04-10 09:16:06 +02:00
api	Add spec for bookmark endpoints	2018-04-11 21:05:34 +02:00
auth	update gem, test pam authentication (#7028)	2018-04-11 21:40:38 +02:00
concerns	Set the default locale in config (#6580)	2018-03-04 09:21:35 +01:00
oauth
settings	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
well_known
about_controller_spec.rb
account_follow_controller_spec.rb
account_unfollow_controller_spec.rb
accounts_controller_spec.rb	Rewrite account_controller_spec (#5633)	2017-11-09 14:36:17 +01:00
application_controller_spec.rb	Improve require_admin! and require_staff! filters (#7018)	2018-04-03 13:07:32 +02:00
authorize_follows_controller_spec.rb	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	2018-01-22 14:25:09 +01:00
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
home_controller_spec.rb	Redirect from Web tag timeline to public tag timeline if not signed in (#6633)	2018-03-05 19:29:36 +01:00
manifests_controller_spec.rb
media_controller_spec.rb
remote_follow_controller_spec.rb
statuses_controller_spec.rb
stream_entries_controller_spec.rb	Redirect to account status page for page of status stream entry (#7104)	2018-04-16 10:04:31 +02:00
tags_controller_spec.rb	Redesign public hashtag pages (#5237)	2017-10-07 20:00:35 +02:00