diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-09-06 23:37:02 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-09-06 23:37:02 +0000 |
| commit | 7920ff1147051324e63c6b28cd93ca616d5b3165 (patch) | |
| tree | 79f5c40229f15d196a86f73eb9fef19fe7ead374 | |
| parent | fd515cca50a35f7f39d8dd134e69c1b275ba632f (diff) | |
| parent | 2f9906c111d6a0f92f9c03f7636278df8ccb24b7 (diff) | |
| download | gitlab-ce-7920ff1147051324e63c6b28cd93ca616d5b3165.tar.gz | |
Merge branch 'weimeng-fix-burndown-x-offset' into 'master'
CE Backport: Fix x-axis burndown chart offset by timezone
See merge request gitlab-org/gitlab-ce!32754
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | yarn.lock | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/package.json b/package.json index 1c3eb409d9b..4256b8bfdcc 100644 --- a/package.json +++ b/package.json @@ -197,6 +197,7 @@ "stylelint": "^10.1.0", "stylelint-config-recommended": "^2.2.0", "stylelint-scss": "^3.9.2", + "timezone-mock": "^1.0.8", "vue-jest": "^4.0.0-beta.2", "webpack-dev-server": "^3.1.14", "yarn-deduplicate": "^1.1.1" diff --git a/yarn.lock b/yarn.lock index 88f5b82b283..c64c3a6acaa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11815,6 +11815,11 @@ timers-browserify@^2.0.4: dependencies: setimmediate "^1.0.4" +timezone-mock@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/timezone-mock/-/timezone-mock-1.0.8.tgz#1b9f7af13f2bf84b7aa3d3d6e24aa17255b6037d" + integrity sha512-7dgx34HJPY8O/c5dbqG+I9S3TVDjrfssXmS8BNqiy8sdYvYDfM7shHpNA6VTDQWcDGyv43bE3El6YuFDQf1X3g== + tiny-emitter@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c" |