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

…

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

…

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

Improve require_admin! and require_staff! filters (#7018)

2018-04-03 13:07:32 +02:00

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

Redirect to account status page for page of status stream entry (#7104)

2018-04-16 10:04:31 +02:00

tags_controller_spec.rb

…