diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-06 18:44:40 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-06 18:44:40 +0300 |
commit | b4415c01740430cef58baf9bb0cbda2fb1055edb (patch) | |
tree | 89ddade2adcb40d95b710760d4fc806c52f94ada /lib/api | |
parent | 415b2f943ba80ef3b6746af0a98c6dbe062e803c (diff) | |
parent | fdb5f285f924e653400f7bbe18d13718c469d74f (diff) |
Merge branch 'issue_44821' into 'master'
Retrieve merge request closing issues from database cache
Closes #44821
See merge request gitlab-org/gitlab-ce!20911
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 2621c9f8fc2..abad418771c 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -380,7 +380,7 @@ module API end get ':id/merge_requests/:merge_request_iid/closes_issues' do merge_request = find_merge_request_with_access(params[:merge_request_iid]) - issues = ::Kaminari.paginate_array(merge_request.closes_issues(current_user)) + issues = ::Kaminari.paginate_array(merge_request.visible_closing_issues_for(current_user)) issues = paginate(issues) external_issues, internal_issues = issues.partition { |issue| issue.is_a?(ExternalIssue) } |