diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2019-03-05 15:15:22 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-05 15:15:22 +0000 |
| commit | 79c421105013c3694679fefe3c1c1d4cb30446fc (patch) | |
| tree | 06149e8b6e1df689226a179d401dfde9b68b206c /app/views/shared/milestones | |
| parent | 42d3117f9c3371e07e8b0aafab6f504e87251c2a (diff) | |
| download | gitlab-ce-79c421105013c3694679fefe3c1c1d4cb30446fc.tar.gz | |
Display the correct number of MRs a user has access to
Diffstat (limited to 'app/views/shared/milestones')
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_tabs.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 40b8374848e..e75f0a184ea 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -32,7 +32,7 @@ = milestone_progress_bar(milestone) = link_to pluralize(milestone.total_issues_count(current_user), 'Issue'), issues_path · - = link_to pluralize(milestone.merge_requests.size, 'Merge Request'), merge_requests_path + = link_to pluralize(milestone.merge_requests_visible_to_user(current_user).size, 'Merge Request'), merge_requests_path .float-lg-right.light #{milestone.percent_complete(current_user)}% complete .col-sm-2 .milestone-actions.d-flex.justify-content-sm-start.justify-content-md-end diff --git a/app/views/shared/milestones/_tabs.html.haml b/app/views/shared/milestones/_tabs.html.haml index 3b435847172..b877f66c71e 100644 --- a/app/views/shared/milestones/_tabs.html.haml +++ b/app/views/shared/milestones/_tabs.html.haml @@ -12,7 +12,7 @@ %li.nav-item = link_to '#tab-merge-requests', class: 'nav-link', 'data-toggle' => 'tab', 'data-endpoint': milestone_merge_request_tab_path(milestone) do Merge Requests - %span.badge.badge-pill= milestone.merge_requests.size + %span.badge.badge-pill= milestone.merge_requests_visible_to_user(current_user).size - else %li.nav-item = link_to '#tab-merge-requests', class: 'nav-link active', 'data-toggle' => 'tab', 'data-endpoint': milestone_merge_request_tab_path(milestone) do |