Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		2019-04-10 09:16:08 +02:00
..
account_actions_controller.rb
account_moderation_notes_controller.rb
accounts_controller.rb
action_logs_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
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
domain_blocks_controller.rb
email_domain_blocks_controller.rb
followers_controller.rb
instances_controller.rb
invites_controller.rb	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02:00
pending_accounts_controller.rb
relays_controller.rb
report_notes_controller.rb
reported_statuses_controller.rb
reports_controller.rb
resets_controller.rb
roles_controller.rb	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
settings_controller.rb	Add validations to admin settings (#10348)	2019-03-23 14:07:04 +01:00
statuses_controller.rb
subscriptions_controller.rb
tags_controller.rb
two_factor_authentications_controller.rb
warning_presets_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00