diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-10-24 16:26:41 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-10-24 18:09:00 -0500 |
| commit | 67d2b2acb3ec88e981f50aa4f4b8a86b9cc1b288 (patch) | |
| tree | 98ab53b9f40fca7ce370aa6ad82893ac697fa096 /app/assets/javascripts/merge_conflicts | |
| parent | 5a4e6721786dd080cd40ca4ea23fc4202a85e73f (diff) | |
| download | gitlab-ce-67d2b2acb3ec88e981f50aa4f4b8a86b9cc1b288.tar.gz | |
replace jquery.cookie vendor script with js.cookie
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, 2 insertions, 2 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 5c5c65f29d4..8d202c8500a 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 @@ -1,7 +1,7 @@ ((global) => { global.mergeConflicts = global.mergeConflicts || {}; - const diffViewType = $.cookie('diff_view'); + const diffViewType = Cookies.get('diff_view'); const HEAD_HEADER_TEXT = 'HEAD//our changes'; const ORIGIN_HEADER_TEXT = 'origin//their changes'; const HEAD_BUTTON_TITLE = 'Use ours'; @@ -180,7 +180,7 @@ this.state.diffView = viewType; this.state.isParallel = viewType === VIEW_TYPES.PARALLEL; - $.cookie('diff_view', viewType, { + Cookies.set('diff_view', viewType, { path: gon.relative_url_root || '/' }); }, |