diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-07-02 06:19:58 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-07-02 06:19:58 +0000 |
| commit | f66169b35c29294ecc9f63eeeedc52085d2a3fd7 (patch) | |
| tree | 272bcdb2ffd338d82b615e075e721a9043bc323a /app/models/issue.rb | |
| parent | f4cc3db38be9583876e0dffdbeb0f759e4945f5f (diff) | |
| parent | 09163e423ac50c8eda82f67e5419142893faf18a (diff) | |
| download | gitlab-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 'app/models/issue.rb')
| -rw-r--r-- | app/models/issue.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 30e29911758..982a94315bd 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -250,8 +250,8 @@ class Issue < ApplicationRecord end # rubocop: enable CodeReuse/ServiceClass - def merge_requests_count - merge_requests_closing_issues.count + def merge_requests_count(user = nil) + ::MergeRequestsClosingIssues.count_for_issue(self.id, user) end def labels_hook_attrs |