diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-01-17 21:01:06 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-01-17 21:01:06 +0000 |
| commit | 195448c28c3a3238126e9e21f7b1abb8f186980e (patch) | |
| tree | 0d2d760317e17aeb3a7dc0d74ffc5d1978a00cb0 /spec/javascripts/notes_spec.js | |
| parent | 525b178e5d5cfe127fe2cfc6f211725e6c3089ae (diff) | |
| parent | f351cc28c2c878bf491bb0886be65bf35b58b261 (diff) | |
| download | gitlab-ce-dispatcher-project-mr-edit.tar.gz | |
Merge branch 'master' into 'dispatcher-project-mr-edit'dispatcher-project-mr-edit
# Conflicts:
# app/assets/javascripts/dispatcher.js
Diffstat (limited to 'spec/javascripts/notes_spec.js')
| -rw-r--r-- | spec/javascripts/notes_spec.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js index 167f074fb9b..a40821a5693 100644 --- a/spec/javascripts/notes_spec.js +++ b/spec/javascripts/notes_spec.js @@ -1,4 +1,5 @@ /* eslint-disable space-before-function-paren, no-unused-expressions, no-var, object-shorthand, comma-dangle, max-len */ +import _ from 'underscore'; import * as urlUtils from '~/lib/utils/url_utility'; import 'autosize'; import '~/gl_form'; |