summaryrefslogtreecommitdiff
path: root/app/views/groups
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-02-23 16:22:36 -0500
committerRubén Dávila <rdavila84@gmail.com>2016-03-04 22:37:03 -0500
commited4808555877c668366d98a5408937712ad10d52 (patch)
tree1a11a41356487d978b6e0ecdf2a84ef20221d192 /app/views/groups
parent834b5d49ecb486065e3ecbf8b36becb416eff366 (diff)
downloadgitlab-ce-ed4808555877c668366d98a5408937712ad10d52.tar.gz
Refactor Merge Requests tab into a custom partial
* Add Labels tab to Groups * Add decorator for label so it's aware of Milestones.
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/milestones/show.html.haml8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml
index 0a15f49ff12..7ffa3f2d518 100644
--- a/app/views/groups/milestones/show.html.haml
+++ b/app/views/groups/milestones/show.html.haml
@@ -67,13 +67,17 @@
= link_to '#tab-participants', 'data-toggle' => 'tab' do
Participants
%span.badge= @milestone.participants.count
+ %li
+ = link_to '#tab-labels', 'data-toggle' => 'tab', 'data-show' => '.tab-issues-buttons' do
+ Labels
+ %span.badge= @milestone.labels.count
.tab-content.milestone-content
.tab-pane.active#tab-issues
= render 'shared/milestones/issues_tab', unassigned: @milestone.opened_issues.unassigned, assigned: @milestone.opened_issues.assigned, closed: @milestone.closed_issues
-
.tab-pane#tab-merge-requests
= render 'shared/milestones/merge_requests_tab', unassigned: @milestone.opened_merge_requests.unassigned, assigned: @milestone.opened_merge_requests.assigned, closed: @milestone.merge_requests.closed, merged: @milestone.merge_requests.merged
-
.tab-pane#tab-participants
= render 'shared/milestones/participants_tab', users: @milestone.participants
+ .tab-pane#tab-labels
+ = render 'shared/milestones/labels_tab', labels: @milestone.labels