diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-09-20 00:23:55 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-09-20 00:51:00 -0500 |
| commit | 62ba000e2d5e12985476f4b831366c2766f52f0e (patch) | |
| tree | 04b00d81384c0c218916b8d7a896a52315e8f419 | |
| parent | 76ae5af8ce9d88cb1da4f8b9836fe78b7c2ad30e (diff) | |
| download | gitlab-ce-62ba000e2d5e12985476f4b831366c2766f52f0e.tar.gz | |
fix diff_view cookie path within merge conflict page22343-honor-user-fixed-layout-pref
| -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); } |