diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-05 20:55:51 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-05 20:55:51 +0000 |
| commit | 008ef89d16b587b40e31e895530d60d7d857afd5 (patch) | |
| tree | 85c7ccf5f60e44f84bf3de4cf684f39289daac2d | |
| parent | ec55d89cf81cdf08920f6a285472797b195ddced (diff) | |
| parent | 5d2299ac210df52fefecd507073367952099c91a (diff) | |
| download | gitlab-ce-008ef89d16b587b40e31e895530d60d7d857afd5.tar.gz | |
Merge branch 'bug/jschatz1/sidebar-issues' into 'master'
Fix diff and commit view on merge requests
with new sidebar
Fixes #3981
See merge request !2718
| -rw-r--r-- | app/helpers/nav_helper.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 2c299d1d794..75f2ed5e054 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -32,8 +32,10 @@ module NavHelper end def page_gutter_class - - if current_path?('merge_requests#show') || current_path?('issues#show') + if current_path?('merge_requests#show') || + current_path?('merge_requests#diffs') || + current_path?('merge_requests#commits') || + current_path?('issues#show') if cookies[:collapsed_gutter] == 'true' "page-gutter right-sidebar-collapsed" else |