summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-03-22 11:03:15 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-03-22 11:03:15 +0000
commit022968764ced43c5de0c3291cfe2fbc7b068e944 (patch)
treef8e35bc8b582ecabb7d0b8e559c652fe0ede8262 /config
parent685a85c6132fbd1f9e5ace08bd4b2808f3a50a8b (diff)
downloadgitlab-ce-022968764ced43c5de0c3291cfe2fbc7b068e944.tar.gz
Revert "Merge branch 'winh-remove-sushi' into 'master'"
This reverts merge request !26430
Diffstat (limited to 'config')
-rw-r--r--config/karma.config.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/karma.config.js b/config/karma.config.js
index 7e1e89f3c10..c30c58edc6f 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -110,7 +110,7 @@ module.exports = function(config) {
frameworks: ['jasmine'],
files: [
{ pattern: 'spec/javascripts/test_bundle.js', watched: false },
- { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.png)', included: false },
+ { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.html.raw|.png)', included: false },
],
preprocessors: {
'spec/javascripts/**/*.js': ['webpack', 'sourcemap'],