diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-08-30 23:30:55 +0000 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-31 09:35:13 -0500 |
commit | dce3e42afc5c07af450b17cf4c774c7214910843 (patch) | |
tree | 07280036ed170c3eef3ca4c42e94f061eb73cfbe | |
parent | 6cd4edb7d869d793ee73f4eb880b900203995cec (diff) | |
download | gitlab-ce-dce3e42afc5c07af450b17cf4c774c7214910843.tar.gz |
Merge branch 'pipelines-layout-regression' into 'master'
Check for pipelines when setting page_gutter_class.
## What does this MR do?
Fixes regression issue related to the MR window sliding behind the right sidebar on page refresh.
## Are there points in the code the reviewer needs to double check?
I'm getting stuck thinking about if/how to test this. Or maybe it just deserves a note somewhere about remembering to update `page_gutter_class` when a new route is added?
## Why was this MR needed?
This regression prevented users from using many features of the MR view.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/21121
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-23_at_11.08.04_AM](/uploads/bad1a83569022a7fc699a978c5abef62/Screen_Shot_2016-08-23_at_11.08.04_AM.png)
After:
![Screen_Shot_2016-08-23_at_11.07.46_AM](/uploads/6cbcb2f849c68dfc93d8a4b53089b06e/Screen_Shot_2016-08-23_at_11.07.46_AM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [ ] Added for this feature/bug
- [x] All builds are passing
- [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)
cc: @jschatz1
See merge request !5952
-rw-r--r-- | CHANGELOG | 2 | ||||
-rw-r--r-- | app/helpers/nav_helper.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 22c5cd7b79b..bb407b04b32 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,8 @@ v 8.11.2 v 8.11.1 - Pulled due to packaging error. +v 8.11.0 (unreleased) + - Fix pipelines tab layout regression (brycepj) v 8.11.0 - Use test coverage value from the latest successful pipeline in badge. !5862 - Add test coverage report badge. !5708 diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 6c1cc6ef072..2b0ff6c0d00 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -25,6 +25,8 @@ module NavHelper current_path?('merge_requests#commits') || current_path?('merge_requests#builds') || current_path?('merge_requests#conflicts') || + current_path?('merge_requests#pipelines') || + current_path?('issues#show') if cookies[:collapsed_gutter] == 'true' "page-gutter right-sidebar-collapsed" |