kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

convert js-cookie dependency to an npm module

This commit is contained in:
Mike Greiling 2017-02-06 00:57:44 -06:00
parent e7ac1628ae
commit e4725a50e3
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/application.js
View File

@ -20,7 +20,7 @@ require('vendor/jquery.waitforimages');
require('vendor/jquery.caret'); require('vendor/jquery.caret');
require('vendor/jquery.atwho'); require('vendor/jquery.atwho');
require('vendor/jquery.scrollTo'); require('vendor/jquery.scrollTo');
window.Cookies = require('vendor/js.cookie'); window.Cookies = require('js-cookie');
require('./autosave'); require('./autosave');
require('bootstrap/js/affix'); require('bootstrap/js/affix');
require('bootstrap/js/alert'); require('bootstrap/js/alert');

2
app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js.es6
View File

@ -3,7 +3,7 @@
/* global Flash */ /* global Flash */
window.Vue = require('vue'); window.Vue = require('vue');
window.Cookies = require('vendor/js.cookie'); window.Cookies = require('js-cookie');
function requireAll(context) { return context.keys().map(context); } function requireAll(context) { return context.keys().map(context); }
requireAll(require.context('./svg', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./svg', false, /^\.\/.*\.(js|es6)$/));

2
app/assets/javascripts/merge_request_tabs.js.es6
View File

@ -4,7 +4,7 @@
/* global Flash */ /* global Flash */
require('./breakpoints'); require('./breakpoints');
window.Cookies = require('vendor/js.cookie'); window.Cookies = require('js-cookie');
require('./flash'); require('./flash');
/* eslint-disable max-len */ /* eslint-disable max-len */

1
package.json
View File

@ -23,6 +23,7 @@
"jquery": "2.2.1", "jquery": "2.2.1",
"jquery-ui": "github:jquery/jquery-ui#1.11.4", "jquery-ui": "github:jquery/jquery-ui#1.11.4",
"jquery-ujs": "1.2.1", "jquery-ujs": "1.2.1",
"js-cookie": "^2.1.3",
"mousetrap": "1.4.6", "mousetrap": "1.4.6",
"pikaday": "^1.5.1", "pikaday": "^1.5.1",
"select2": "3.5.2-browserify", "select2": "3.5.2-browserify",

2
spec/javascripts/test_bundle.js
View File

@ -7,7 +7,7 @@ jasmine.getJSONFixtures().fixturesPath = 'base/spec/javascripts/fixtures';
// include common libraries // include common libraries
window.$ = window.jQuery = require('jquery'); window.$ = window.jQuery = require('jquery');
window._ = require('underscore'); window._ = require('underscore');
window.Cookies = require('vendor/js.cookie'); window.Cookies = require('js-cookie');
window.Vue = require('vue'); window.Vue = require('vue');
window.Vue.use(require('vue-resource')); window.Vue.use(require('vue-resource'));
require('jquery-ujs'); require('jquery-ujs');