Commit 62ba000e authored by Mike Greiling's avatar Mike Greiling

fix diff_view cookie path within merge conflict page

parent 76ae5af8
...@@ -201,7 +201,9 @@ class MergeConflictDataProvider { ...@@ -201,7 +201,9 @@ class MergeConflictDataProvider {
vi.diffViewType = newType; vi.diffViewType = newType;
vi.isParallel = newType === 'parallel'; vi.isParallel = newType === 'parallel';
$.cookie('diff_view', newType); // TODO: Make sure that cookie path added. $.cookie('diff_view', newType, {
path: (gon && gon.relative_url_root) || '/'
});
$('.content-wrapper .container-fluid') $('.content-wrapper .container-fluid')
.toggleClass('container-limited', !vi.isParallel && vi.fixedLayout); .toggleClass('container-limited', !vi.isParallel && vi.fixedLayout);
} }
......
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