diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-09-01 22:00:43 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-09 12:23:21 +0000 |
| commit | 7730f5f7ec363e1f38f3b1afc88a844d8fae533d (patch) | |
| tree | 89881a6d99489633ec205b1aa46e8e22cebef055 | |
| parent | a0d5bb0bb84d15efaedb78025bd480758b2a4246 (diff) | |
| download | gitlab-ce-21764-build-page-title.tar.gz | |
Removed soon-to-be un-needed project title additions from builds and environments21764-build-page-title
Removed unneeded `project_title` code and last reference
Added CHANGELOG entry
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/helpers/projects_helper.rb | 7 | ||||
| -rw-r--r-- | app/views/projects/artifacts/browse.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/builds/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/environments/_header_title.html.haml | 1 |
5 files changed, 4 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b072ce9f60..4eefae8ed0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ entry. - Fail gracefully when creating merge request with non-existing branch (alexsanford) - Fix mobile layout issues in admin user overview page !7087 - Fix HipChat notifications rendering (airatshigapov, eisnerd) +- Removed unneeded "Builds" and "Environments" link from project titles - Remove 'Edit' button from wiki edit view !7143 (Hiroyuki Sato) - Cleaned up global namespace JS !19661 (Jose Ivan Vargas) - Refactor Jira service to use jira-ruby gem diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 42c00ec3cd5..17123b1eaee 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -49,7 +49,7 @@ module ProjectsHelper end end - def project_title(project, name = nil, url = nil) + def project_title(project) namespace_link = if project.group link_to(simple_sanitize(project.group.name), group_path(project.group)) @@ -66,10 +66,7 @@ module ProjectsHelper end end - full_title = "#{namespace_link} / #{project_link}".html_safe - full_title << ' · '.html_safe << link_to(simple_sanitize(name), url) if name - - full_title + "#{namespace_link} / #{project_link}".html_safe end def remove_project_message(project) diff --git a/app/views/projects/artifacts/browse.html.haml b/app/views/projects/artifacts/browse.html.haml index 539d07d634a..ede01dcc1aa 100644 --- a/app/views/projects/artifacts/browse.html.haml +++ b/app/views/projects/artifacts/browse.html.haml @@ -1,5 +1,4 @@ - page_title 'Artifacts', "#{@build.name} (##{@build.id})", 'Builds' -- header_title project_title(@project, "Builds", project_builds_path(@project)) .top-block.row-content-block.clearfix .pull-right diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml index ae7a7ecb392..f533eec642e 100644 --- a/app/views/projects/builds/show.html.haml +++ b/app/views/projects/builds/show.html.haml @@ -1,6 +1,6 @@ - @no_container = true - page_title "#{@build.name} (##{@build.id})", "Builds" -- header_title project_title(@project, "Builds", project_builds_path(@project)) +- trace_with_state = @build.trace_with_state = render "projects/pipelines/head", build_subnav: true %div{ class: container_class } diff --git a/app/views/projects/environments/_header_title.html.haml b/app/views/projects/environments/_header_title.html.haml deleted file mode 100644 index e056fccad5d..00000000000 --- a/app/views/projects/environments/_header_title.html.haml +++ /dev/null @@ -1 +0,0 @@ -- header_title project_title(@project, "Environments", project_environments_path(@project)) |