diff options
author | Regis <boudinot.regis@yahoo.com> | 2017-01-25 14:01:44 -0700 |
---|---|---|
committer | Regis <boudinot.regis@yahoo.com> | 2017-01-25 14:01:44 -0700 |
commit | d4b2f4dd8332701c2df0003a213b34abe0163599 (patch) | |
tree | ec868cb769c6656bbcb4b42b65710ab72717598e /lib/api/helpers.rb | |
parent | 5348985015cd0f3163ed7617eb86df63396db16b (diff) | |
parent | 112f9710b65fe830a058366cde1734a2928764de (diff) | |
download | gitlab-ce-pipeline_index_vue_error_state.tar.gz |
Merge branch 'master' into pipeline_index_vue_error_statepipeline_index_vue_error_state
Diffstat (limited to 'lib/api/helpers.rb')
-rw-r--r-- | lib/api/helpers.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 49c5f0652ab..a1d7b323f4f 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -90,6 +90,12 @@ module API MergeRequestsFinder.new(current_user, project_id: user_project.id).find(id) end + def find_merge_request_with_access(id, access_level = :read_merge_request) + merge_request = user_project.merge_requests.find(id) + authorize! access_level, merge_request + merge_request + end + def authenticate! unauthorized! unless current_user end |