Commit 901159bb authored by Phil Hughes's avatar Phil Hughes

Merge branch 'unify-test_bundle.js' into 'master'

Unify spec/javascripts/test_bundle.js

See merge request gitlab-org/gitlab-ce!20136
parents b9e5859a 2ec741e1
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
import $ from 'jquery'; import $ from 'jquery';
import 'vendor/jasmine-jquery'; import 'vendor/jasmine-jquery';
import '~/commons'; import '~/commons';
import Vue from 'vue'; import Vue from 'vue';
import VueResource from 'vue-resource'; import VueResource from 'vue-resource';
import Translate from '~/vue_shared/translate'; import Translate from '~/vue_shared/translate';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment