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/helpers/issuables_helper.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/helpers/issuables_helper.rb')
| -rw-r--r-- | app/helpers/issuables_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 045de105b77..cd2669ef6ad 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -280,7 +280,7 @@ module IssuablesHelper initialTaskStatus: issuable.task_status } - data[:hasClosingMergeRequest] = issuable.merge_requests_count != 0 if issuable.is_a?(Issue) + data[:hasClosingMergeRequest] = issuable.merge_requests_count(current_user) != 0 if issuable.is_a?(Issue) if parent.is_a?(Group) data[:groupPath] = parent.path |