diff options
Diffstat (limited to 'app/helpers/nav_helper.rb')
| -rw-r--r-- | app/helpers/nav_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 37cd491e19f..4d6ab7b8bf9 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -21,7 +21,7 @@ module NavHelper def page_gutter_class moved_sidebar_enabled = current_controller?('merge_requests') && moved_mr_sidebar_enabled? - if page_has_markdown? + if page_has_markdown? && !current_controller?('conflicts') if cookies[:collapsed_gutter] == 'true' ["page-gutter", "#{'right-sidebar-collapsed' unless moved_sidebar_enabled}"] else |