diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-10-24 16:54:38 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-10-24 18:09:00 -0500 |
| commit | f8520f5d096a7b62649c7465491003b3317c5e75 (patch) | |
| tree | ca6b7b89e257822c3c39a91dc8dbc99a5526875a /app/assets/javascripts/merge_conflicts | |
| parent | 1c0213f28e423b28c17bf7b377086a782ba88b50 (diff) | |
| download | gitlab-ce-f8520f5d096a7b62649c7465491003b3317c5e75.tar.gz | |
remove manual Cookie.set "path" option in favor of global setting
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 index 8d202c8500a..791db57262f 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 @@ -180,9 +180,7 @@ this.state.diffView = viewType; this.state.isParallel = viewType === VIEW_TYPES.PARALLEL; - Cookies.set('diff_view', viewType, { - path: gon.relative_url_root || '/' - }); + Cookies.set('diff_view', viewType); }, getHeadHeaderLine(id) { |