diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-03-08 15:42:55 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-03-08 15:42:55 +0000 |
| commit | c14d37a33440d70780928586e4df223301ef8746 (patch) | |
| tree | 9803f6e0c634099eb130b00feebb282eb09ad179 | |
| parent | 160290298748de37a10f75ccebc84455ee8ec4f4 (diff) | |
| parent | 2906278f9341eb6901ad6bb0978eace35480eae2 (diff) | |
| download | gitlab-ce-c14d37a33440d70780928586e4df223301ef8746.tar.gz | |
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
| -rw-r--r-- | app/views/projects/_activity.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/activity.html.haml | 1 |
2 files changed, 1 insertions, 1 deletions
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' |