diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-06 13:02:51 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-06 13:02:51 +0100 |
| commit | 384445eca6249363c0da6d8b96e7ee030dc6fab3 (patch) | |
| tree | c4eedd06e7487a6d5ba68b7e9ce6973b8d85e7f3 /app/views/layouts | |
| parent | 6d3b5ea2a9611dc7d87bd48043f34f9e0930e052 (diff) | |
| download | gitlab-ce-384445eca6249363c0da6d8b96e7ee030dc6fab3.tar.gz | |
Don't override issue page description in project layout.
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_head.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/group.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/project.html.haml | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 1a2187e551b..38ca4f91c4d 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -1,3 +1,5 @@ +- page_description brand_title unless page_description + - site_name = "GitLab" %head{prefix: "og: http://ogp.me/ns#"} %meta{charset: "utf-8"} diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml index 1ce8d0ef7b5..2e483b7148d 100644 --- a/app/views/layouts/group.html.haml +++ b/app/views/layouts/group.html.haml @@ -1,5 +1,5 @@ - page_title @group.name -- page_description @group.description +- page_description @group.description unless page_description - header_title group_title(@group) unless header_title - sidebar "group" unless sidebar diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index f81283a5ddb..ab527e8e438 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -1,5 +1,5 @@ - page_title @project.name_with_namespace -- page_description @project.description +- page_description @project.description unless page_description - header_title project_title(@project) unless header_title - sidebar "project" unless sidebar |