Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2019-03-05 15:41:09 +0300
committerYorick Peterse <yorickpeterse@gmail.com>2019-03-05 15:41:09 +0300
commit7d3284f60df5f54c2d04925bcc6092a8da422ced (patch)
treead7206a163065301490cf8adf50969028a0c85e9 /app/views/shared
parentcb64d81b9e85aba5d1a29000c12722fa79e654a7 (diff)
parent5cdcd339fadb6cd818c35548ae8aa3d44a9ae9d0 (diff)
Merge dev.gitlab.org master into GitLab.com master
Diffstat (limited to 'app/views/shared')
-rw-r--r--app/views/shared/milestones/_tabs.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/milestones/_tabs.html.haml b/app/views/shared/milestones/_tabs.html.haml
index 55460acab8f..3b435847172 100644
--- a/app/views/shared/milestones/_tabs.html.haml
+++ b/app/views/shared/milestones/_tabs.html.haml
@@ -21,11 +21,11 @@
%li.nav-item
= link_to '#tab-participants', class: 'nav-link', 'data-toggle' => 'tab', 'data-endpoint': milestone_participants_tab_path(milestone) do
Participants
- %span.badge.badge-pill= milestone.participants.count
+ %span.badge.badge-pill= milestone.issue_participants_visible_by_user(current_user).count
%li.nav-item
= link_to '#tab-labels', class: 'nav-link', 'data-toggle' => 'tab', 'data-endpoint': milestone_labels_tab_path(milestone) do
Labels
- %span.badge.badge-pill= milestone.labels.count
+ %span.badge.badge-pill= milestone.issue_labels_visible_by_user(current_user).count
- issues = milestone.sorted_issues(current_user)
- show_project_name = local_assigns.fetch(:show_project_name, false)