diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-07 11:43:18 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-08-07 11:43:18 +0100 |
commit | fecb1a2f3c77205a72eeff1a3501629d2d1811d8 (patch) | |
tree | db6fe0c250f3238b011fe47afca301e77e529a6c /yarn.lock | |
parent | 7065bb3ef31fe04bea39aa07d620552eaaa26aba (diff) | |
parent | 03b816f3e845c9b25d3588336fc1616238465deb (diff) | |
download | gitlab-ce-fecb1a2f3c77205a72eeff1a3501629d2d1811d8.tar.gz |
Merge branch 'master' into issue-discussions-refactor
* master: (21 commits)
Fix issues with pdf-js dependencies
fix missing changelog entries for security release on 2017-01-23
Update top bar issues icon
Fix order of CI lint ace editor loading
Fix spec
Fix spec
Fix spec
Add changelog
fix
Add a spec for concurrent process
Add changelog
essential
add CHANGELOG.md for !13208
adjust user contribution calendar time formatting
fix rubocop violations 👮
fix mysql syntax for date INTERVAL arithmatic
add tests for proper timezone date grouping within ContributionsCalendar
adjust timezone for date grouping in contributions calendar
use timezone-aware Date.current instead of Date.today in ContributionsCalendar class
display system timezone underneath activity calendar
...
Diffstat (limited to 'yarn.lock')
-rw-r--r-- | yarn.lock | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/yarn.lock b/yarn.lock index 91756b82db4..504448265b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3771,10 +3771,6 @@ nested-error-stacks@^1.0.0: dependencies: inherits "~2.0.1" -node-ensure@^0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz#ecae764150de99861ec5c810fd5d096b183932a7" - node-libs-browser@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-1.1.1.tgz#2a38243abedd7dffcd07a97c9aca5668975a6fea" @@ -4185,13 +4181,6 @@ pbkdf2@^3.0.3: dependencies: create-hmac "^1.1.2" -pdfjs-dist@^1.8.252: - version "1.8.252" - resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-1.8.252.tgz#2477245695341f7fe096824dacf327bc324c0f52" - dependencies: - node-ensure "^0.0.0" - worker-loader "^0.8.0" - pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -5932,12 +5921,6 @@ wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" -worker-loader@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-0.8.0.tgz#13582960dcd7d700dc829d3fd252a7561696167e" - dependencies: - loader-utils "^1.0.2" - wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" |