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

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

accounts_controller.rb

Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)

2018-04-02 13:45:07 +02:00

action_logs_controller.rb

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

base_controller.rb

Add “public” pack to admin controller, as it is included in upstream admin layout

2018-03-30 18:16:47 +02:00

confirmations_controller.rb

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

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

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

email_domain_blocks_controller.rb

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

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

Add invite filter (#5862)

2017-12-01 16:40:02 +01:00

report_notes_controller.rb

Feature: Report improvements (#6967) (#7000)

2018-04-02 22:04:14 +02:00

reported_statuses_controller.rb

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

reports_controller.rb

Feature: Report improvements (#6967) (#7000)

2018-04-02 22:04:14 +02:00

resets_controller.rb

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

roles_controller.rb

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

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

Add moderator role and add pundit policies for admin actions (#5635)

2017-11-11 20:23:33 +01:00

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