diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-18 10:16:56 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 10:16:56 +0200 |
| commit | 2cf7f09b1e9ccb000433374a42bd7b33b73f8116 (patch) | |
| tree | 743e4ed2a6f2739541891749a6ef31bfd09e6805 /lib/api/helpers.rb | |
| parent | 1266e2664e7b080b440f5fc004424418284ee87b (diff) | |
| download | gitlab-ce-2cf7f09b1e9ccb000433374a42bd7b33b73f8116.tar.gz | |
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'
""
This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50.
See !4892.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/api/helpers.rb')
| -rw-r--r-- | lib/api/helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 77e407b54c5..73557cf7db6 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -17,7 +17,7 @@ module API def current_user @current_user ||= (find_user_by_private_token || doorkeeper_guard) - unless @current_user && Gitlab::UserAccess.allowed?(@current_user) + unless @current_user && Gitlab::UserAccess.new(@current_user).allowed? return nil end |