diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-07-13 13:57:30 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-13 13:57:30 -0500 |
| commit | 530f5158e297f3cde27f3566cfe13bad74ba3b50 (patch) | |
| tree | 270507d396bacdae8a4aa3489edfff0f47b718ca /lib/api/helpers.rb | |
| parent | 9b0ef1559f78e58b398e428763ff97dfdc53e186 (diff) | |
| download | gitlab-ce-530f5158e297f3cde27f3566cfe13bad74ba3b50.tar.gz | |
Revert "Merge branch '18193-developers-can-merge' into 'master'
"
This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing
changes made to fb229bbf7970ba908962b837b270adf56f14098f.
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 73557cf7db6..77e407b54c5 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.new(@current_user).allowed? + unless @current_user && Gitlab::UserAccess.allowed?(@current_user) return nil end |