diff options
| -rw-r--r-- | app/assets/javascripts/merge_conflict_data_provider.js.es6 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflict_data_provider.js.es6 b/app/assets/javascripts/merge_conflict_data_provider.js.es6 index f6e1409ee47..13ee794ba38 100644 --- a/app/assets/javascripts/merge_conflict_data_provider.js.es6 +++ b/app/assets/javascripts/merge_conflict_data_provider.js.es6 @@ -201,7 +201,9 @@ class MergeConflictDataProvider { vi.diffViewType = newType; 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') .toggleClass('container-limited', !vi.isParallel && vi.fixedLayout); } |