summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-11-08 06:39:15 +0000
committerMike Greiling <mike@pixelcog.com>2017-11-08 06:39:15 +0000
commita979153b6469d328622e8d7ad2b286c6330e1520 (patch)
tree67017e257f57b93c8f27fafeb5388070bc91a005
parenta845cf24ad1c0f5f26cb5b57e2d09c71637af0a3 (diff)
parent4bd90ec31161acbba0febcac51beeece08c1dd5a (diff)
downloadgitlab-ce-a979153b6469d328622e8d7ad2b286c6330e1520.tar.gz
Merge branch 'jivl-fix-karma-config-file' into 'master'
fix karma config file See merge request gitlab-org/gitlab-ce!15263
-rw-r--r--config/karma.config.js9
1 files changed, 0 insertions, 9 deletions
diff --git a/config/karma.config.js b/config/karma.config.js
index e459f5cdac3..9f018d14b8f 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -67,14 +67,5 @@ module.exports = function(config) {
karmaConfig.customLaunchers.ChromeHeadlessCustom.flags.push('--enable-logging', '--v=1');
}
- if (process.env.DEBUG) {
- karmaConfig.logLevel = config.LOG_DEBUG;
- process.env.CHROME_LOG_FILE = process.env.CHROME_LOG_FILE || 'chrome_debug.log';
- }
-
- if (process.env.CHROME_LOG_FILE) {
- karmaConfig.customLaunchers.ChromeHeadlessCustom.flags.push('--enable-logging', '--v=1');
- }
-
config.set(karmaConfig);
};