diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-03-01 22:33:29 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-03-01 22:33:29 +0000 |
| commit | b112a33b98c657b1d2838c14d598a291a14565e0 (patch) | |
| tree | a37cc22491baf419a15b81918ee07c2fd0d8f2da /spec/javascripts/environments/environment_table_spec.js | |
| parent | 4441ca4ba7bf6c4a68574d018d2bf48e45326654 (diff) | |
| parent | 5c4eace67f188da436b3b380a0125d053b29422a (diff) | |
| download | gitlab-ce-sentiment-analysis.tar.gz | |
Merge branch 'master' into 'sentiment-analysis'sentiment-analysis
# Conflicts:
# app/assets/javascripts/notes/components/comment_form.vue
Diffstat (limited to 'spec/javascripts/environments/environment_table_spec.js')
| -rw-r--r-- | spec/javascripts/environments/environment_table_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/environments/environment_table_spec.js b/spec/javascripts/environments/environment_table_spec.js index 9bd42863759..0e5e50a59a5 100644 --- a/spec/javascripts/environments/environment_table_spec.js +++ b/spec/javascripts/environments/environment_table_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import environmentTableComp from '~/environments/components/environments_table.vue'; -import mountComponent from '../helpers/vue_mount_component_helper'; +import mountComponent from 'spec/helpers/vue_mount_component_helper'; describe('Environment table', () => { let Component; |