diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-18 19:37:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 19:37:07 +0100 |
| commit | 74ee5bdf37799fba5990a6b492e3d52c32efe8d7 (patch) | |
| tree | afdeb6b23ff4d7bd5e53c4e13cb2c3dfafb4b986 /app/controllers/admin/roles_controller.rb | |
| parent | 36d27e289177fdec5332539c94b8192022a412f2 (diff) | |
| parent | 0ef2c1415a13d305d4c73c71f27a1366eee702a0 (diff) | |
Merge pull request #862 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/roles_controller.rb')
| -rw-r--r-- | app/controllers/admin/roles_controller.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb index af7ec0740..13f56e9be 100644 --- a/app/controllers/admin/roles_controller.rb +++ b/app/controllers/admin/roles_controller.rb @@ -17,11 +17,5 @@ module Admin log_action :demote, @user redirect_to admin_account_path(@user.account_id) end - - private - - def set_user - @user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound) - end end end |