You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
activitypub	Revert #5772 (#6221)	7 years ago
admin	Feature: Allow staff to change user emails (#7074)	7 years ago
api	Add spec for bookmark endpoints	7 years ago
auth	update gem, test pam authentication (#7028)	7 years ago
concerns	Set the default locale in config (#6580)	7 years ago
oauth	…
settings	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
well_known	…
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	…
application_controller_spec.rb	Improve require_admin! and require_staff! filters (#7018)	7 years ago
authorize_follows_controller_spec.rb	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	7 years ago
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)	7 years ago
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)	7 years ago
tags_controller_spec.rb	…