You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		6 years ago
..
account_moderation_notes_controller.rb	…
accounts_controller.rb	Change admin accounts default sort to most recent (#8813)	6 years ago
action_logs_controller.rb	…
base_controller.rb	Fix statuses batch checkboxes in admin panel (fixes #411)	6 years ago
change_emails_controller.rb	Feature: Allow staff to change user emails (#7074)	7 years ago
confirmations_controller.rb	Add resend confirmation for admin (#7378)	7 years ago
custom_emojis_controller.rb	…
dashboard_controller.rb	Display trending hashtags on admin dashboard (#8038)	6 years ago
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	…
instances_controller.rb	…
invites_controller.rb	Add admin function to deactivate all invites (#8279)	6 years ago
relays_controller.rb	Add federation relay support (#7998)	6 years ago
report_notes_controller.rb	Feature: Improve reports ui (#7032)	7 years ago
reported_statuses_controller.rb	Improve admin UI for accounts (#7360)	7 years ago
reports_controller.rb	Add confirmation step to account suspensions (#8353)	6 years ago
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
silences_controller.rb	…
statuses_controller.rb	Allow to show a specific status in the admin interface	6 years ago
subscriptions_controller.rb	…
suspensions_controller.rb	Fix regression when suspending not from report (#8400)	6 years ago
two_factor_authentications_controller.rb	…