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.

David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		7 years ago
..
account_moderation_notes_controller.rb	Add logging of admin actions (#5757)	7 years ago
accounts_controller.rb	Clean up admin UI for accounts (#6004)	7 years ago
action_logs_controller.rb	Add logging of admin actions (#5757)	7 years ago
base_controller.rb	Merge branch 'gs-master' into glitch-theme	7 years ago
confirmations_controller.rb	Add logging of admin actions (#5757)	7 years ago
custom_emojis_controller.rb	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	7 years ago
domain_blocks_controller.rb	Add logging of admin actions (#5757)	7 years ago
email_domain_blocks_controller.rb	Add logging of admin actions (#5757)	7 years ago
instances_controller.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
invites_controller.rb	Add invite filter (#5862)	7 years ago
reported_statuses_controller.rb	Add logging of admin actions (#5757)	7 years ago
reports_controller.rb	Add logging of admin actions (#5757)	7 years ago
resets_controller.rb	Add logging of admin actions (#5757)	7 years ago
roles_controller.rb	Add logging of admin actions (#5757)	7 years ago
settings_controller.rb	Add option to show only local toots in timeline preview (#6292)	7 years ago
silences_controller.rb	Add logging of admin actions (#5757)	7 years ago
statuses_controller.rb	Add logging of admin actions (#5757)	7 years ago
subscriptions_controller.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
suspensions_controller.rb	Add logging of admin actions (#5757)	7 years ago
two_factor_authentications_controller.rb	Add logging of admin actions (#5757)	7 years ago