diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-04-05 18:45:35 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-04-05 18:45:35 +0100 |
| commit | 8131a02fef9241f396c827cb7613ddd307f0a551 (patch) | |
| tree | eca9cac2c0ba6e228b42bab90d8fd0cf0a9b191e /app/views/shared/milestones | |
| parent | ee1954efc19470c477ddbdf965731dc25598e6b0 (diff) | |
| parent | f103475766fecc6e6fdf996e9cfaaa41e795962f (diff) | |
| download | gitlab-ce-8131a02fef9241f396c827cb7613ddd307f0a551.tar.gz | |
Merge remote-tracking branch 'origin/master' into deprecation-warning-for-dynamic-milestones
Diffstat (limited to 'app/views/shared/milestones')
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 1 | ||||
| -rw-r--r-- | app/views/shared/milestones/_top.html.haml | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 5926867e2d7..ac494814f55 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -56,6 +56,7 @@ type: 'button', data: { url: promote_project_milestone_path(milestone.project, milestone), milestone_title: milestone.title, + group_name: @project.group.name, target: '#promote-milestone-modal', container: 'body', toggle: 'modal' } } diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml index 4539c745f9a..797ff034bb2 100644 --- a/app/views/shared/milestones/_top.html.haml +++ b/app/views/shared/milestones/_top.html.haml @@ -1,4 +1,6 @@ -- page_title milestone.title, "Milestones" +- page_title milestone.title +- @breadcrumb_link = dashboard_milestone_path(milestone.safe_title, title: milestone.title) + - group = local_assigns[:group] - is_dynamic_milestone = milestone.legacy_group_milestone? || milestone.dashboard_milestone? @@ -17,7 +19,7 @@ Milestone #{milestone.title} - if milestone.due_date || milestone.start_date %span.creator - · + · = milestone_date_range(milestone) - if group .pull-right |