diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-07-08 08:50:17 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-07-08 08:50:17 +0000 |
| commit | 902525abdf8c86408d504908d4b6d402d59604e7 (patch) | |
| tree | e7f3917667cba868cd5b987e47e77b5cdd85e29d /spec/javascripts | |
| parent | 6a4cc804afc5b38f1883d7bcdb9d8a918e94fd4f (diff) | |
| parent | 7ca77203c0622697123e2fdb6f377d87e3de901b (diff) | |
| download | gitlab-ce-902525abdf8c86408d504908d4b6d402d59604e7.tar.gz | |
Merge branch '60213-fix-is-ee-webpack-checks' into 'master'
Replace runtime isEE check with compile time one
Closes #60213
See merge request gitlab-org/gitlab-ce!30351
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/test_bundle.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index 2cc476ed52a..50741e249ca 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -8,7 +8,6 @@ import '~/commons'; import Vue from 'vue'; import VueResource from 'vue-resource'; import Translate from '~/vue_shared/translate'; -import CheckEE from '~/vue_shared/mixins/is_ee'; import jasmineDiff from 'jasmine-diff'; import { config as testUtilsConfig } from '@vue/test-utils'; @@ -48,7 +47,6 @@ Vue.config.errorHandler = function(err) { Vue.use(VueResource); Vue.use(Translate); -Vue.use(CheckEE); // enable test fixtures jasmine.getFixtures().fixturesPath = FIXTURES_PATH; |