David Yip 67e77f230e Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.		2018-04-08 19:05:02 -05:00
..
account_moderation_notes_controller.rb
accounts_controller.rb
action_logs_controller.rb
base_controller.rb
confirmations_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
custom_emojis_controller.rb
domain_blocks_controller.rb
email_domain_blocks_controller.rb
instances_controller.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
invites_controller.rb
report_notes_controller.rb
reported_statuses_controller.rb
reports_controller.rb
resets_controller.rb
roles_controller.rb
settings_controller.rb	Redesign landing page (again) (#6486)	2018-02-22 01:03:48 +01:00
silences_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
statuses_controller.rb	Prevent admins and moderators eavesdropping in private and direct toots (#7067)	2018-04-07 21:33:01 +02:00
subscriptions_controller.rb
suspensions_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
two_factor_authentications_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00