summaryrefslogtreecommitdiff
path: root/app/views/projects/milestones
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-06 12:12:19 +0100
committerPhil Hughes <me@iamphill.com>2017-09-06 12:12:19 +0100
commit2aa8a75f69e338a94cca52a43058d156c0e3a1a1 (patch)
tree47b5f489b69e2d2e4e389fdd2586cca3781a8da7 /app/views/projects/milestones
parentde82bd8e447ae7b4b7e66f0368f5f43311848186 (diff)
parent1632ffa6ad16738994122f0e84f331d50f220879 (diff)
downloadgitlab-ce-2aa8a75f69e338a94cca52a43058d156c0e3a1a1.tar.gz
Merge branch 'master' into breadcrumbs-improvements
Diffstat (limited to 'app/views/projects/milestones')
-rw-r--r--app/views/projects/milestones/index.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index e0b29b0c2e1..71ec88ef1c1 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -1,7 +1,7 @@
- @no_container = true
- page_title 'Milestones'
-- if show_new_nav? && can?(current_user, :admin_milestone, @project)
+- if can?(current_user, :admin_milestone, @project)
- content_for :breadcrumbs_extra do
= link_to "New milestone", new_namespace_project_milestone_path(@project.namespace, @project), class: 'btn btn-new', title: 'New milestone'
@@ -11,10 +11,10 @@
.top-area
= render 'shared/milestones_filter', counts: milestone_counts(@project.milestones)
- .nav-controls{ class: ("nav-controls-new-nav" if show_new_nav?) }
+ .nav-controls.nav-controls-new-nav
= render 'shared/milestones_sort_dropdown'
- if can?(current_user, :admin_milestone, @project)
- = link_to new_project_milestone_path(@project), class: "btn btn-new #{("visible-xs" if show_new_nav?)}", title: 'New milestone' do
+ = link_to new_project_milestone_path(@project), class: "btn btn-new visible-xs", title: 'New milestone' do
New milestone
.milestones