Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

account_actions_controller.rb

…

account_moderation_notes_controller.rb

…

accounts_controller.rb

Do not distribute Delete when rejecting unapproved accounts (#10321)

2019-03-19 16:33:30 +01:00

action_logs_controller.rb

…

base_controller.rb

…

change_emails_controller.rb

…

confirmations_controller.rb

…

custom_emojis_controller.rb

Randomize emoji filename (#10090)

2019-02-22 16:52:04 +01:00

dashboard_controller.rb

Fix keybase indication on dashboard

2019-04-19 00:57:39 +02:00

domain_blocks_controller.rb

Provide a link to existing domain block when trying to block an already-blocked domain (#10663)

2019-05-03 20:36:36 +02:00

email_domain_blocks_controller.rb

…

followers_controller.rb

Fix list of local followers showing remote followers in admin UI (#9700)

2019-01-03 06:40:16 +01:00

instances_controller.rb

Add domain search/filter to the "Federation" (/admin/instances) page (#10071)

2019-02-18 14:59:19 +01:00

invites_controller.rb

…

pending_accounts_controller.rb

Add invite request to pending account notification e-mail (#10528)

2019-04-10 00:36:01 +02:00

relays_controller.rb

…

report_notes_controller.rb

…

reported_statuses_controller.rb

Do not error out when performing admin actions on no statuses (#10094)

2019-02-21 19:36:48 +01:00

reports_controller.rb

…

resets_controller.rb

…

roles_controller.rb

…

settings_controller.rb

Add validations to admin settings (#10348)

2019-03-23 14:07:04 +01:00

statuses_controller.rb

Add quick links to the admin interface in the WebUI (#8545)

2019-01-04 13:10:43 +01:00

subscriptions_controller.rb

…

tags_controller.rb

…

two_factor_authentications_controller.rb

…

warning_presets_controller.rb

…