diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 18:40:06 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 18:40:06 +0000 |
| commit | 9353c5c780c7af6d6ed3d6c501b155f82debc99c (patch) | |
| tree | 55d87571798f5ff10ee1431a296f1115251f67e9 /spec/javascripts/sidebar/assignees_spec.js | |
| parent | c287c01821c4db4830dbdd5263907f08c2ed4cc4 (diff) | |
| parent | e2638c3ff2714e5efd4bc54e64555fc564c84af1 (diff) | |
| download | gitlab-ce-pipelines_show_refactor.tar.gz | |
Merge branch 'master' into 'pipelines_show_refactor'pipelines_show_refactor
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'spec/javascripts/sidebar/assignees_spec.js')
| -rw-r--r-- | spec/javascripts/sidebar/assignees_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/sidebar/assignees_spec.js b/spec/javascripts/sidebar/assignees_spec.js index c9453a21189..4e4343812bd 100644 --- a/spec/javascripts/sidebar/assignees_spec.js +++ b/spec/javascripts/sidebar/assignees_spec.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import Assignee from '~/sidebar/components/assignees/assignees'; +import Assignee from '~/sidebar/components/assignees/assignees.vue'; import UsersMock from './mock_data'; import UsersMockHelper from '../helpers/user_mock_data_helper'; |