diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2018-03-06 19:28:54 +0300 |
|---|---|---|
| committer | Felipe Artur <fcardozo@gitlab.com> | 2018-03-06 19:28:54 +0300 |
| commit | e77c4e9efe0e19187929e5836cda5a3a59d0f89f (patch) | |
| tree | 91daaa89bb48457456f931c6b818f5e200390b56 /app/views/layouts | |
| parent | 1e137c273ca6314d0ed6744910b95f179b1d538c (diff) | |
| parent | 9a8f5a2b605f85ace3c81a32cf1855f79cabde43 (diff) | |
Merge branch 'master' into 'issue_38337'
# Conflicts:
# app/models/group.rb
# db/schema.rb
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/nav/projects_dropdown/_show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/project.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/nav/projects_dropdown/_show.html.haml b/app/views/layouts/nav/projects_dropdown/_show.html.haml index 59becb043d3..5809d6f7fea 100644 --- a/app/views/layouts/nav/projects_dropdown/_show.html.haml +++ b/app/views/layouts/nav/projects_dropdown/_show.html.haml @@ -1,4 +1,4 @@ -- project_meta = { id: @project.id, name: @project.name, namespace: @project.name_with_namespace, web_url: project_path(@project), avatar_url: @project.avatar_url } if @project&.persisted? +- project_meta = { id: @project.id, name: @project.name, namespace: @project.full_name, web_url: project_path(@project), avatar_url: @project.avatar_url } if @project&.persisted? .projects-dropdown-container .project-dropdown-sidebar.qa-projects-dropdown-sidebar %ul diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 6b847fb4b7c..6b51483810e 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -1,4 +1,4 @@ -- page_title @project.name_with_namespace +- page_title @project.full_name - page_description @project.description unless page_description - header_title project_title(@project) unless header_title - nav "project" |