summaryrefslogtreecommitdiff
path: root/app/views/groups/milestones
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-25 14:17:17 +0200
committerDouwe Maan <douwe@gitlab.com>2015-05-27 14:23:04 +0200
commit7a11ef3e959735fffb189ad03218593f700ce25b (patch)
treec981e19f921df6b60cc5bd3c0666f155dc2a3966 /app/views/groups/milestones
parent511791014e032c8800c0b8b06130b73aad8505b5 (diff)
downloadgitlab-ce-7a11ef3e959735fffb189ad03218593f700ce25b.tar.gz
Add Browse Issues button to Dashboard and Group milestones.
Diffstat (limited to 'app/views/groups/milestones')
-rw-r--r--app/views/groups/milestones/_milestone.html.haml4
-rw-r--r--app/views/groups/milestones/show.html.haml3
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/groups/milestones/_milestone.html.haml b/app/views/groups/milestones/_milestone.html.haml
index 30093d2d05d..ba30e6e07c6 100644
--- a/app/views/groups/milestones/_milestone.html.haml
+++ b/app/views/groups/milestones/_milestone.html.haml
@@ -9,10 +9,10 @@
= link_to_gfm truncate(milestone.title, length: 100), group_milestone_path(@group, milestone.safe_title, title: milestone.title)
.row
.col-sm-6
- = link_to group_milestone_path(@group, milestone.safe_title, title: milestone.title) do
+ = link_to issues_group_path(@group, milestone_title: milestone.title) do
= pluralize milestone.issue_count, 'Issue'
&nbsp;
- = link_to group_milestone_path(@group, milestone.safe_title, title: milestone.title) do
+ = link_to merge_requests_group_path(@group, milestone_title: milestone.title) do
= pluralize milestone.merge_requests_count, 'Merge Request'
&nbsp;
%span.light #{milestone.percent_complete}% complete
diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml
index 6c41cd6b9e4..8f2decb851f 100644
--- a/app/views/groups/milestones/show.html.haml
+++ b/app/views/groups/milestones/show.html.haml
@@ -62,6 +62,9 @@
Participants
%span.badge= @group_milestone.participants.count
+ .pull-right
+ = link_to 'Browse Issues', issues_group_path(@group, milestone_title: @group_milestone.title), class: "btn edit-milestone-link btn-grouped"
+
.tab-content
.tab-pane.active#tab-issues
.row