diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-03-11 00:45:34 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-03-22 03:07:27 -0500 |
| commit | 5f7c0bd7b7cdd6d7f4d735b9efaecea59cecc0c4 (patch) | |
| tree | 83f7014eba06a1623fbc78eae2ba59264b2cf021 /app/assets/javascripts/merge_conflicts/merge_conflict_store.js | |
| parent | 77eda5287097fad15bd3439744b64b6068d3b1b6 (diff) | |
| download | gitlab-ce-5f7c0bd7b7cdd6d7f4d735b9efaecea59cecc0c4.tar.gz | |
remove Cookies class from global space
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/merge_conflict_store.js')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js index 07632d6225c..c4e379a4a0b 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js @@ -1,7 +1,7 @@ /* eslint-disable comma-dangle, object-shorthand, no-param-reassign, camelcase, no-nested-ternary, no-continue, max-len */ -/* global Cookies */ import Vue from 'vue'; +import Cookies from 'js-cookie'; ((global) => { global.mergeConflicts = global.mergeConflicts || {}; |