diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-11-24 10:18:57 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-11-24 10:18:57 +0000 |
| commit | 7c1e54d58d7ee0308b865d9563f1dfeb54568e16 (patch) | |
| tree | 8aa54a0cf3905920041e20e1bbaa555c9cf940d5 | |
| parent | c4d844f08b99a5251f0d3cea7a493cb3480d5626 (diff) | |
| parent | b8c31fd9ce030bb5749c1cf66211b706b2346f4e (diff) | |
| download | gitlab-ce-7c1e54d58d7ee0308b865d9563f1dfeb54568e16.tar.gz | |
Merge branch '40465-update-timeago-js' into 'master'
Resolve "Update timeago.js"
Closes #40465
See merge request gitlab-org/gitlab-ce!15553
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 16 |
2 files changed, 14 insertions, 4 deletions
diff --git a/package.json b/package.json index 1937acb4be4..921f985d350 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "three": "^0.84.0", "three-orbit-controls": "^82.1.0", "three-stl-loader": "^1.0.4", - "timeago.js": "^2.0.5", + "timeago.js": "^3.0.2", "underscore": "^1.8.3", "url-loader": "^0.5.8", "visibilityjs": "^1.2.4", diff --git a/yarn.lock b/yarn.lock index 7628e6dcd91..7ef5566e4b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -58,6 +58,10 @@ version "1.0.2" resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.0.2.tgz#e4d29058e2bb438ba71ac525c6397ef15ae2877b" +"@types/jquery@^2.0.40": + version "2.0.48" + resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-2.0.48.tgz#3e90d8cde2d29015e5583017f7830cb3975b2eef" + abbrev@1, abbrev@1.0.x: version "1.0.9" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" @@ -6085,9 +6089,15 @@ thunky@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/thunky/-/thunky-0.1.0.tgz#bf30146824e2b6e67b0f2d7a4ac8beb26908684e" -timeago.js@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-2.0.5.tgz#730c74fbdb0b0917a553675a4460e3a7f80db86c" +time-stamp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357" + +timeago.js@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-3.0.2.tgz#32a67e7c0d887ea42ca588d3aae26f77de5e76cc" + dependencies: + "@types/jquery" "^2.0.40" timed-out@^2.0.0: version "2.0.0" |