diff options
| author | James Edwards-Jones <jamedjo@gmail.com> | 2017-02-06 15:12:27 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jamedjo@gmail.com> | 2017-02-06 15:12:27 +0000 |
| commit | b988faaf85c8e68d501f242b980e5e79a00e2b15 (patch) | |
| tree | faffbfe623bfcbfe1c09bddac00b2cc879baff63 /spec/javascripts/issue_spec.js | |
| parent | 5af4cae544c8526de63e639bd6c7db730526add3 (diff) | |
| parent | 53db7d1d75e1d14cb20278bd0c1a75ce24a6626d (diff) | |
| download | gitlab-ce-jej-pages-to-ce.tar.gz | |
Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/javascripts/issue_spec.js')
| -rw-r--r-- | spec/javascripts/issue_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/issue_spec.js b/spec/javascripts/issue_spec.js index 673a4b3c07a..5b0b7aa7903 100644 --- a/spec/javascripts/issue_spec.js +++ b/spec/javascripts/issue_spec.js @@ -1,8 +1,8 @@ /* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, no-use-before-define, comma-dangle, max-len */ /* global Issue */ -/*= require lib/utils/text_utility */ -/*= require issue */ +require('~/lib/utils/text_utility'); +require('~/issue'); (function() { var INVALID_URL = 'http://goesnowhere.nothing/whereami'; |