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 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		6 years ago
..
account_actions_controller.rb	…
account_moderation_notes_controller.rb	…
accounts_controller.rb	Add waiting time to list of pending accounts in admin UI (#10985)	6 years ago
action_logs_controller.rb	…
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	Randomize emoji filename (#10090)	6 years ago
dashboard_controller.rb	Fix keybase indication on dashboard	6 years ago
domain_blocks_controller.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	6 years ago
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)	6 years ago
relays_controller.rb	…
report_notes_controller.rb	…
reported_statuses_controller.rb	Do not error out when performing admin actions on no statuses (#10094)	6 years ago
reports_controller.rb	…
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	Add validations to admin settings (#10348)	6 years ago
statuses_controller.rb	…
subscriptions_controller.rb	…
tags_controller.rb	…
two_factor_authentications_controller.rb	…
warning_presets_controller.rb	…