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	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
dashboard_controller.rb	Change icons of features on admin dashboard to remove bias (#10366)	2019-03-26 01:24:19 +01:00
domain_blocks_controller.rb
email_domain_blocks_controller.rb
followers_controller.rb
instances_controller.rb
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
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
subscriptions_controller.rb
tags_controller.rb
two_factor_authentications_controller.rb
warning_presets_controller.rb