From f06147f88a105538075ffb3766988973db1c0eb1 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 8 Mar 2017 15:42:55 +0000 Subject: 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 --- app/views/projects/_activity.html.haml | 1 - app/views/projects/activity.html.haml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml index fb990dd9592..aa0cb3e1a50 100644 --- 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 diff --git a/app/views/projects/activity.html.haml b/app/views/projects/activity.html.haml index 3c0f01cbf6f..27c8e3c7fca 100644 --- 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' -- cgit v1.2.1