Skip to content

Commit 7920ff1

Browse files
committed
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
2 parents fd515cc + 2f9906c commit 7920ff1

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
"stylelint": "^10.1.0",
198198
"stylelint-config-recommended": "^2.2.0",
199199
"stylelint-scss": "^3.9.2",
200+
"timezone-mock": "^1.0.8",
200201
"vue-jest": "^4.0.0-beta.2",
201202
"webpack-dev-server": "^3.1.14",
202203
"yarn-deduplicate": "^1.1.1"

yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11815,6 +11815,11 @@ timers-browserify@^2.0.4:
1181511815
dependencies:
1181611816
setimmediate "^1.0.4"
1181711817

11818+
timezone-mock@^1.0.8:
11819+
version "1.0.8"
11820+
resolved "https://registry.yarnpkg.com/timezone-mock/-/timezone-mock-1.0.8.tgz#1b9f7af13f2bf84b7aa3d3d6e24aa17255b6037d"
11821+
integrity sha512-7dgx34HJPY8O/c5dbqG+I9S3TVDjrfssXmS8BNqiy8sdYvYDfM7shHpNA6VTDQWcDGyv43bE3El6YuFDQf1X3g==
11822+
1181811823
tiny-emitter@^2.0.0:
1181911824
version "2.0.2"
1182011825
resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c"

0 commit comments

Comments
 (0)