summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-27 12:32:47 +0000
committerRémy Coutable <remy@rymai.me>2017-04-27 12:32:47 +0000
commit86038fa5d5ceea2d7236b99ed0351e7a33922d0b (patch)
tree782d1dcb40b5fb16eddb5e4a54846d0a952ed5ab /lib
parent025b04f3e7976ac8829e24fcb587d86574b0037d (diff)
parent4dfdef2ddfc3cdeb6f6231e397543d120083a4c2 (diff)
downloadgitlab-ce-86038fa5d5ceea2d7236b99ed0351e7a33922d0b.tar.gz
Merge branch '29505-allow-admins-sudo-to-blocked-users' into 'master'
Allow admins to sudo to blocked users See merge request !10842
Diffstat (limited to 'lib')
-rw-r--r--lib/api/helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index ddff3c8c1e8..86bf567fe69 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -102,7 +102,7 @@ module API
end
def authenticate!
- unauthorized! unless current_user && can?(current_user, :access_api)
+ unauthorized! unless current_user && can?(initial_current_user, :access_api)
end
def authenticate_non_get!