diff options
Diffstat (limited to 'app/helpers/nav_helper.rb')
| -rw-r--r-- | app/helpers/nav_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 0cf2c5cea4c..bf3b132e33a 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -21,11 +21,11 @@ module NavHelper def page_gutter_class moved_sidebar_enabled = current_controller?('merge_requests') && moved_mr_sidebar_enabled? - if page_has_markdown? && !current_controller?('conflicts') + if (page_has_markdown? || current_path?('projects/merge_requests#diffs')) && !current_controller?('conflicts') if cookies[:collapsed_gutter] == 'true' - ["page-gutter", "#{'right-sidebar-collapsed' unless moved_sidebar_enabled}"] + ["page-gutter", ('right-sidebar-collapsed' unless moved_sidebar_enabled).to_s] else - ["page-gutter", "#{'right-sidebar-expanded' unless moved_sidebar_enabled}"] + ["page-gutter", ('right-sidebar-expanded' unless moved_sidebar_enabled).to_s] end elsif current_path?('jobs#show') %w[page-gutter build-sidebar right-sidebar-expanded] |