diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-01-23 22:37:14 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-01-23 22:37:14 +0000 |
| commit | 74da79113bb2eb7363403d7c2a9f1e0624590b74 (patch) | |
| tree | c9ce3d5cc90b6468b77502ebc2997d009439e389 | |
| parent | fbbd81eee6faf9ee9cb3f4071c35bc93147b94b3 (diff) | |
| parent | da3faca7be258c25a53d648a49ae16b7e4b8171c (diff) | |
| download | gitlab-ce-74da79113bb2eb7363403d7c2a9f1e0624590b74.tar.gz | |
Merge branch '42251-explicit-timezone-for-karma' into 'master'
Set timezone for karma CI job to Etc/UTC (UTC+0)
Closes #42251
See merge request gitlab-org/gitlab-ce!16602
| -rw-r--r-- | changelogs/unreleased/42251-explicit-timezone-for-karma.yml | 5 | ||||
| -rw-r--r-- | config/karma.config.js | 2 |
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 = { |