summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2018-01-21 15:16:25 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2018-01-23 15:53:58 +0000
commitda3faca7be258c25a53d648a49ae16b7e4b8171c (patch)
tree0a888d3a2c48b4b39de96d3b6bb7c118df996284
parentba02e3a5dfb0fb95a1a32b81e893b6fe2ea39b9e (diff)
downloadgitlab-ce-da3faca7be258c25a53d648a49ae16b7e4b8171c.tar.gz
Set timezone for karma to UTC
-rw-r--r--changelogs/unreleased/42251-explicit-timezone-for-karma.yml5
-rw-r--r--config/karma.config.js2
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/42251-explicit-timezone-for-karma.yml b/changelogs/unreleased/42251-explicit-timezone-for-karma.yml
new file mode 100644
index 00000000000..25e0e774c48
--- /dev/null
+++ b/changelogs/unreleased/42251-explicit-timezone-for-karma.yml
@@ -0,0 +1,5 @@
+---
+title: Set timezone for karma to UTC
+merge_request: 16602
+author: Takuya Noguchi
+type: other
diff --git a/config/karma.config.js b/config/karma.config.js
index 9f018d14b8f..a101d35704e 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -18,6 +18,8 @@ webpackConfig.devtool = 'cheap-inline-source-map';
// Karma configuration
module.exports = function(config) {
+ process.env.TZ = 'Etc/UTC';
+
var progressReporter = process.env.CI ? 'mocha' : 'progress';
var karmaConfig = {