Merge branch 'dm-remove-double-project-nav-bar' into 'master'

Don't show double nav bar on project page when activity is the default project view Closes #29096 See merge request !9798
2017-03-08 15:42:55 +00:00 · 2017-03-08 15:42:55 +00:00 · c14d37a334
parent 1602902987 2906278f93
commit c14d37a334
2 changed files with 1 additions and 1 deletions
--- a/app/views/projects/_activity.html.haml
+++ b/app/views/projects/_activity.html.haml
@ -1,5 +1,4 @@
 - @no_container = true
-= render "projects/head"

 %div{ class: container_class }
  .nav-block.activity-filter-block
--- a/app/views/projects/activity.html.haml
+++ b/app/views/projects/activity.html.haml
@ -1,4 +1,5 @@
 - page_title "Activity"
+= render "projects/head"

 = render 'projects/last_push'