diff options
| author | Starfall <us@starfall.systems> | 2020-11-19 10:02:56 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-11-19 10:02:56 -0600 |
| commit | 383bb3804bdbd6caa442283cc96ef0cdbfdb4575 (patch) | |
| tree | 54ecc09c325567ab1cfc4af9ba13ad134d9c3c72 /app/controllers/admin | |
| parent | 259470ec37dfc5c3d34ed5456adcd3ab1a622a18 (diff) | |
| parent | db01f8b942b72eaa2eacbb144261b002f8079c9c (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/accounts_controller.rb | 7 | ||||
| -rw-r--r-- | app/controllers/admin/announcements_controller.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index b9b75727d..1dd7430e0 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -53,6 +53,13 @@ module Admin redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.destroyed_msg', username: @account.acct) end + def unsensitive + authorize @account, :unsensitive? + @account.unsensitize! + log_action :unsensitive, @account + redirect_to admin_account_path(@account.id) + end + def unsilence authorize @account, :unsilence? @account.unsilence! diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb index 494fd13d0..351b9a991 100644 --- a/app/controllers/admin/announcements_controller.rb +++ b/app/controllers/admin/announcements_controller.rb @@ -71,7 +71,7 @@ class Admin::AnnouncementsController < Admin::BaseController private def set_announcements - @announcements = AnnouncementFilter.new(filter_params).results.page(params[:page]) + @announcements = AnnouncementFilter.new(filter_params).results.reverse_chronological.page(params[:page]) end def set_announcement |