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/subscriptions.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/subscriptions.rb')
| -rw-r--r-- | lib/api/subscriptions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/subscriptions.rb b/lib/api/subscriptions.rb index 10749b34004..e11d7537cc9 100644 --- a/lib/api/subscriptions.rb +++ b/lib/api/subscriptions.rb @@ -3,8 +3,8 @@ module API before { authenticate! } subscribable_types = { - 'merge_request' => proc { |id| user_project.merge_requests.find(id) }, - 'merge_requests' => proc { |id| user_project.merge_requests.find(id) }, + 'merge_request' => proc { |id| find_merge_request_with_access(id, :update_merge_request) }, + 'merge_requests' => proc { |id| find_merge_request_with_access(id, :update_merge_request) }, 'issues' => proc { |id| find_project_issue(id) }, 'labels' => proc { |id| find_project_label(id) }, } |