summaryrefslogtreecommitdiff
path: root/app/controllers/admin/application_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-04-22 23:19:55 +0200
committerDouwe Maan <douwe@selenight.nl>2016-04-22 23:21:56 +0200
commitd3462e711c0b3cc17ef47e1ffffa6f40f98b5e98 (patch)
tree84dd1dfaf30c703e2e77a13d0c37a1d8c939d80d /app/controllers/admin/application_controller.rb
parent80893cad672361e62c0c05c2cf9262209bc54fd2 (diff)
downloadgitlab-ce-d3462e711c0b3cc17ef47e1ffffa6f40f98b5e98.tar.gz
Fix issue with impersonation
Diffstat (limited to 'app/controllers/admin/application_controller.rb')
-rw-r--r--app/controllers/admin/application_controller.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/admin/application_controller.rb b/app/controllers/admin/application_controller.rb
index 9083bfb41cf..cf795d977ce 100644
--- a/app/controllers/admin/application_controller.rb
+++ b/app/controllers/admin/application_controller.rb
@@ -6,12 +6,6 @@ class Admin::ApplicationController < ApplicationController
layout 'admin'
def authenticate_admin!
- return render_404 unless current_user.is_admin?
- end
-
- def authorize_impersonator!
- if session[:impersonator_id]
- User.find_by!(username: session[:impersonator_id]).admin?
- end
+ render_404 unless current_user.is_admin?
end
end