diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-02-17 21:31:59 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-02-17 21:31:59 +0000 |
| commit | 71377c1aa0a7469f80c489d2da351d5da08d6964 (patch) | |
| tree | 509f597bc7b7933952857b7c31dc6b54b17f19b3 | |
| parent | bb94c3bf74586b237481ac7b96503e5eac8b488d (diff) | |
| parent | bf93a9f50c9fa3c1133d24af701829879eba2f44 (diff) | |
| download | gitlab-ce-71377c1aa0a7469f80c489d2da351d5da08d6964.tar.gz | |
Merge branch 'remove-issue-and-mr-counts-from-labels-page' into 'master'
Remove issue and MR counts from label index
Closes #25413
See merge request !9332
| -rw-r--r-- | app/views/shared/_label.html.haml | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/remove-issue-and-mr-counts-from-labels-page.yml | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index ead9b84b991..1744a597c51 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -1,6 +1,4 @@ - label_css_id = dom_id(label) -- open_issues_count = label.open_issues_count(current_user) -- open_merge_requests_count = label.open_merge_requests_count(current_user) - status = label_subscription_status(label, @project).inquiry if current_user - subject = local_assigns[:subject] @@ -15,10 +13,10 @@ %ul %li = link_to_label(label, subject: subject, type: :merge_request) do - = pluralize open_merge_requests_count, 'merge request' + view merge requests %li = link_to_label(label, subject: subject) do - = pluralize open_issues_count, 'open issue' + view open issues - if current_user && defined?(@project) %li.label-subscription - if label.is_a?(ProjectLabel) @@ -40,9 +38,9 @@ .pull-right.hidden-xs.hidden-sm.hidden-md = link_to_label(label, subject: subject, type: :merge_request, css_class: 'btn btn-transparent btn-action') do - = pluralize open_merge_requests_count, 'merge request' + view merge requests = link_to_label(label, subject: subject, css_class: 'btn btn-transparent btn-action') do - = pluralize open_issues_count, 'open issue' + view open issues - if current_user && defined?(@project) .label-subscription.inline diff --git a/changelogs/unreleased/remove-issue-and-mr-counts-from-labels-page.yml b/changelogs/unreleased/remove-issue-and-mr-counts-from-labels-page.yml new file mode 100644 index 00000000000..b75b4644ba3 --- /dev/null +++ b/changelogs/unreleased/remove-issue-and-mr-counts-from-labels-page.yml @@ -0,0 +1,4 @@ +--- +title: Remove issue and MR counts from labels index +merge_request: +author: |