FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/controllers/admin
History
Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
 		2019-09-13 18:13:43 +02:00
..
account_actions_controller.rb Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
account_moderation_notes_controller.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
accounts_controller.rb Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
action_logs_controller.rb
…
base_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
change_emails_controller.rb
…
confirmations_controller.rb Move #set_user to Admin::BaseController (#9470) 2018-12-17 11:40:51 +01:00
custom_emojis_controller.rb Add batch actions and categories to admin UI for custom emojis (#11793) 2019-09-09 22:44:17 +02:00
dashboard_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-08 08:44:33 +02:00
domain_allows_controller.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
domain_blocks_controller.rb Add domain block notes (#11515) 2019-08-07 20:20:23 +02:00
email_domain_blocks_controller.rb
…
followers_controller.rb Fix list of local followers showing remote followers in admin UI (#9700) 2019-01-03 06:40:16 +01:00
instances_controller.rb Add domain block notes (#11515) 2019-08-07 20:20:23 +02:00
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 Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
reported_statuses_controller.rb Do not error out when performing admin actions on no statuses (#10094) 2019-02-21 19:36:48 +01:00
reports_controller.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
resets_controller.rb Move #set_user to Admin::BaseController (#9470) 2018-12-17 11:40:51 +01:00
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 Add quick links to the admin interface in the WebUI (#8545) 2019-01-04 13:10:43 +01:00
subscriptions_controller.rb
…
tags_controller.rb Add batch approve/reject for pending hashtags in admin UI (#11791) 2019-09-09 12:50:09 +02:00
two_factor_authentications_controller.rb Move #set_user to Admin::BaseController (#9470) 2018-12-17 11:40:51 +01:00
warning_presets_controller.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00