diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-27 18:43:51 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-27 18:43:51 +0000 |
| commit | c066dc6c37ab678bcea0c3bed1503b2d4486b6e1 (patch) | |
| tree | d01e9d1ed915d58bd00b564e99584ac59460476b /spec/javascripts/feature_highlight | |
| parent | b17912a8af08ada189fc4dc2f864d619ca0bed86 (diff) | |
| parent | d4867c518f2d72125c619c191fa9577dabb1ae9a (diff) | |
| download | gitlab-ce-remove-snippets-bundle.tar.gz | |
Merge branch 'master' into 'remove-snippets-bundle'remove-snippets-bundle
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'spec/javascripts/feature_highlight')
| -rw-r--r-- | spec/javascripts/feature_highlight/feature_highlight_helper_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js b/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js index 34ffc7b1016..1b1f28f3ddb 100644 --- a/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js +++ b/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js @@ -8,7 +8,7 @@ import { mouseenter, inserted, } from '~/feature_highlight/feature_highlight_helper'; -import getSetTimeoutPromise from '../helpers/set_timeout_promise_helper'; +import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper'; describe('feature highlight helper', () => { describe('getSelector', () => { |