diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 15:40:52 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 15:40:52 +0000 |
| commit | b5b8dc83cc1bb271877c79532ecfb555540672a7 (patch) | |
| tree | 190f6cd6991cbfbabbd670a7aac5ff36eb1a64bb /spec/javascripts/sidebar/assignees_spec.js | |
| parent | deef09cd1f0dbe5cab5095ff02f19a5c3588cb91 (diff) | |
| parent | ff2f57da791890957fe97efd46f5c34f270a0c46 (diff) | |
| download | gitlab-ce-dispatcher-cycle-analytics.tar.gz | |
Merge branch 'master' into 'dispatcher-cycle-analytics'dispatcher-cycle-analytics
# 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'; |