summaryrefslogtreecommitdiff
path: root/lib/api/merge_requests.rb
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2019-07-02 06:19:58 +0000
committerMarin Jankovski <marin@gitlab.com>2019-07-02 06:19:58 +0000
commitf66169b35c29294ecc9f63eeeedc52085d2a3fd7 (patch)
tree272bcdb2ffd338d82b615e075e721a9043bc323a /lib/api/merge_requests.rb
parentf4cc3db38be9583876e0dffdbeb0f759e4945f5f (diff)
parent09163e423ac50c8eda82f67e5419142893faf18a (diff)
downloadgitlab-ce-f66169b35c29294ecc9f63eeeedc52085d2a3fd7.tar.gz
Merge branch 'security-59581-related-merge-requests-count' into 'master'
Expose merge requests count based on user access See merge request gitlab/gitlabhq!3157
Diffstat (limited to 'lib/api/merge_requests.rb')
-rw-r--r--lib/api/merge_requests.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index bf87e9ec2ff..6b8c1a2c0e8 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -72,7 +72,7 @@ module API
if params[:view] == 'simple'
options[:with] = Entities::MergeRequestSimple
else
- options[:issuable_metadata] = issuable_meta_data(merge_requests, 'MergeRequest')
+ options[:issuable_metadata] = issuable_meta_data(merge_requests, 'MergeRequest', current_user)
end
options