diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-27 22:20:44 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-27 22:20:44 +0000 |
| commit | a9b1a85bedb16298009a64aaf7bd321fb3da9be1 (patch) | |
| tree | b4485f2497438deb674fd1d757ce02261112d4c6 | |
| parent | a6762595c4f334350a8cf122b975769d02176cbb (diff) | |
| parent | b52f45a0dbdb9d4d8d0dc63c3ac3a7e6e30ee679 (diff) | |
| download | gitlab-ce-a9b1a85bedb16298009a64aaf7bd321fb3da9be1.tar.gz | |
Merge branch '30112-fix-pipelines-sub-nav-highlight' into 'master'
Fix sub-nav highlighting for `Environments` and `Jobs` pages
Closes #30112
See merge request !10254
| -rw-r--r-- | app/views/projects/pipelines/_head.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/30112-fix-pipelines-sub-nav-highlight.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/projects/pipelines/_head.html.haml b/app/views/projects/pipelines/_head.html.haml index b02fef638ff..bc57f7f1c46 100644 --- a/app/views/projects/pipelines/_head.html.haml +++ b/app/views/projects/pipelines/_head.html.haml @@ -10,13 +10,13 @@ Pipelines - if project_nav_tab? :builds - = nav_link(path: 'builds#index', controller: :builds) do + = nav_link(controller: :builds) do = link_to project_builds_path(@project), title: 'Jobs', class: 'shortcuts-builds' do %span Jobs - if project_nav_tab? :environments - = nav_link(path: 'environments#index', controller: :environments) do + = nav_link(controller: :environments) do = link_to project_environments_path(@project), title: 'Environments', class: 'shortcuts-environments' do %span Environments diff --git a/changelogs/unreleased/30112-fix-pipelines-sub-nav-highlight.yml b/changelogs/unreleased/30112-fix-pipelines-sub-nav-highlight.yml new file mode 100644 index 00000000000..deca629be83 --- /dev/null +++ b/changelogs/unreleased/30112-fix-pipelines-sub-nav-highlight.yml @@ -0,0 +1,4 @@ +--- +title: Fix sub-nav highlighting for `Environments` and `Jobs` pages +merge_request: 10254 +author: |