about summary refs log tree commit diff
path: root/app/controllers/admin/roles_controller.rb
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-11-24 01:17:20 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-11-24 01:17:20 +0000
commit167fe2ab08288ce286f5c7660ff0ed587b65b988 (patch)
tree1a4c7d23cb3dd6993c0ce57a637a161e3405dba5 /app/controllers/admin/roles_controller.rb
parentfaad820458401b5a01f24d4da4bf2acf59ef440d (diff)
parente84fecb7e97851ed56f4d954e2d68128bb87da37 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/admin/roles_controller.rb')
-rw-r--r--app/controllers/admin/roles_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index 8f8685827..af7ec0740 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -7,12 +7,14 @@ module Admin
     def promote
       authorize @user, :promote?
       @user.promote!
+      log_action :promote, @user
       redirect_to admin_account_path(@user.account_id)
     end
 
     def demote
       authorize @user, :demote?
       @user.demote!
+      log_action :demote, @user
       redirect_to admin_account_path(@user.account_id)
     end