summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-03-26 16:03:28 +0000
committerMike Greiling <mike@pixelcog.com>2019-03-26 16:03:28 +0000
commitad985a7a28c19a085011afc7531f4f2c13783cb2 (patch)
tree56546845700e6551628d6ad79d46b74901a25460 /config
parent02b29ce8846760ac91ec560d737a38497a5b9155 (diff)
downloadgitlab-ce-ad985a7a28c19a085011afc7531f4f2c13783cb2.tar.gz
Merge branch 'winh-remove-sushi' into 'master'
Remove .raw from JavaScript fixture file names Closes #59201 See merge request gitlab-org/gitlab-ce!26430 (cherry picked from commit 79a45f7f02939a1c2fc1f378e43ec9b96630f918)
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 c30c58edc6f..7e1e89f3c10 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|.html.raw|.png)', included: false },
+ { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.png)', included: false },
],
preprocessors: {
'spec/javascripts/**/*.js': ['webpack', 'sourcemap'],