David Yip 4cca1d1e7e Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	app/controllers/auth/confirmations_controller.rb

2017-12-30 17:20:07 -06:00

..

account_moderation_notes_controller.rb

…

accounts_controller.rb

Clean up admin UI for accounts (#6004)

2017-12-13 12:15:10 +01:00

action_logs_controller.rb

…

base_controller.rb

…

confirmations_controller.rb

…

custom_emojis_controller.rb

keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)

2017-12-30 02:43:43 +01:00

domain_blocks_controller.rb

…

email_domain_blocks_controller.rb

…

instances_controller.rb

…

invites_controller.rb

…

reported_statuses_controller.rb

…

reports_controller.rb

…

resets_controller.rb

…

roles_controller.rb

…

settings_controller.rb

Add more instance stats APIs (#6125)

2017-12-29 19:52:04 +01:00

silences_controller.rb

…

statuses_controller.rb

…

subscriptions_controller.rb

…

suspensions_controller.rb

…

two_factor_authentications_controller.rb

…