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/extensions/array_spec.js.es6 | |
parent | 5af4cae544c8526de63e639bd6c7db730526add3 (diff) | |
parent | 53db7d1d75e1d14cb20278bd0c1a75ce24a6626d (diff) | |
download | gitlab-ce-b988faaf85c8e68d501f242b980e5e79a00e2b15.tar.gz |
Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/javascripts/extensions/array_spec.js.es6')
-rw-r--r-- | spec/javascripts/extensions/array_spec.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/extensions/array_spec.js.es6 b/spec/javascripts/extensions/array_spec.js.es6 index 3949c5615d5..ba5eb81defc 100644 --- a/spec/javascripts/extensions/array_spec.js.es6 +++ b/spec/javascripts/extensions/array_spec.js.es6 @@ -1,6 +1,6 @@ /* eslint-disable space-before-function-paren, no-var */ -/*= require extensions/array */ +require('~/extensions/array'); (function() { describe('Array extensions', function() { |