diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-11 11:57:07 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-11 11:57:07 +0000 |
| commit | 8a1441fb025bf9f46d42017e069382a44ade28d0 (patch) | |
| tree | e5034235c53b6db61994c645c76a2708962cb05c /spec | |
| parent | 5e95296278a629df317d769ae70a3bb9513a64cd (diff) | |
| parent | e4725a50e3c39b55eddbce3a573456ac6323473f (diff) | |
| download | gitlab-ce-8a1441fb025bf9f46d42017e069382a44ade28d0.tar.gz | |
Merge branch 'clean-javascript-vendor-files' into 'master'
Convert some vendored javascript assets to npm modules
See merge request !8990
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/environments/environment_item_spec.js.es6 | 2 | ||||
| -rw-r--r-- | spec/javascripts/test_bundle.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6 index d87cc0996c9..e6fb0d00290 100644 --- a/spec/javascripts/environments/environment_item_spec.js.es6 +++ b/spec/javascripts/environments/environment_item_spec.js.es6 @@ -1,4 +1,4 @@ -window.timeago = require('vendor/timeago'); +window.timeago = require('timeago.js'); require('~/environments/components/environment_item'); describe('Environment item', () => { diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index 7df8d2fd8b4..030d2de090a 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -7,7 +7,7 @@ jasmine.getJSONFixtures().fixturesPath = 'base/spec/javascripts/fixtures'; // include common libraries window.$ = window.jQuery = require('jquery'); window._ = require('underscore'); -window.Cookies = require('vendor/js.cookie'); +window.Cookies = require('js-cookie'); window.Vue = require('vue'); window.Vue.use(require('vue-resource')); require('jquery-ujs'); |