diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-18 15:31:07 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 15:31:07 +0000 |
commit | 08264f4334ff48d1274f066cd5b03455bc4befdf (patch) | |
tree | 2a5873d81f4b927f7bdac562906e4c42e6494b1e /lib/api | |
parent | a6e99ab18e5bc3fe34a7e4b29ea28c95630b0c7a (diff) | |
parent | de1fa5010f705927ac5f5c01ce9595d3c52d44ef (diff) | |
download | gitlab-ce-08264f4334ff48d1274f066cd5b03455bc4befdf.tar.gz |
Merge branch 'undo-revert-of-4892' into 'master'
19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-state
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'""
## What does this MR do?
Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564.
## What are the relevant issue numbers?
Closes #19872.
See merge request !5310
Diffstat (limited to 'lib/api')
-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 |