BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit da844cb5 by Fatih Acet
Options

Merge branch '21764-build-page-title' into 'master'

Remove project_title additions from builds and environments ## What does this MR do? Removed soon-to-be un-needed project title additions from builds and environments. **This MR depends on !5998, which introduces subnav to these pages. Without it we're just removing a useful link.** ## Are there points in the code the reviewer needs to double check? @iamphill Is this right of me? One of these still exists in `projects/artifacts/browse`, I'm not sure whether to fix the issue with `project_title`, which already has some issues with its chevron, or just remove it as it will soon be redundant. ## Why was this MR needed? ## Screenshots (if relevant) **BEFORE:** ![Screen_Shot_2016-10-27_at_14.58.22](/uploads/2915289fb06603c33d1abbcdab70c962/Screen_Shot_2016-10-27_at_14.58.22.png) **AFTER:** ![Screen_Shot_2016-10-27_at_14.58.29](/uploads/ad8574aeaa6771737bb9002d749b5559/Screen_Shot_2016-10-27_at_14.58.29.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21764 See merge request !6160
parents 41899c2a 7730f5f7
Showing with 4 additions and 8 deletions
CHANGELOG.md
......@@ -51,6 +51,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
......
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 << ' &middot; '.html_safe << link_to(simple_sanitize(name), url) if name
full_title
"#{namespace_link} / #{project_link}".html_safe
end
def remove_project_message(project)
......
app/views/projects/artifacts/browse.html.haml
- 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
......
app/views/projects/builds/show.html.haml
- @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 }
......
app/views/projects/environments/_header_title.html.haml deleted 100644 → 0
- header_title project_title(@project, "Environments", project_environments_path(@project))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment