diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-03-08 15:42:55 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-10 13:25:13 -0800 |
| commit | f06147f88a105538075ffb3766988973db1c0eb1 (patch) | |
| tree | f457a1d39475c7d92bc9184385c760315d109580 | |
| parent | fd6150f7b5f0d83ec1fd244b947995a6773d4945 (diff) | |
| download | gitlab-ce-f06147f88a105538075ffb3766988973db1c0eb1.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' |