Commit 008ef89d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents ec55d89c 5d2299ac
...@@ -32,8 +32,10 @@ module NavHelper ...@@ -32,8 +32,10 @@ module NavHelper
end end
def page_gutter_class def page_gutter_class
if current_path?('merge_requests#show') ||
if current_path?('merge_requests#show') || current_path?('issues#show') current_path?('merge_requests#diffs') ||
current_path?('merge_requests#commits') ||
current_path?('issues#show')
if cookies[:collapsed_gutter] == 'true' if cookies[:collapsed_gutter] == 'true'
"page-gutter right-sidebar-collapsed" "page-gutter right-sidebar-collapsed"
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment