summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-11-22 23:06:16 +0100
committerTim Zallmann <tzallmann@gitlab.com>2017-11-24 08:30:58 +0100
commit850e182f9f3190b2b9652f0d8567e8147bf43137 (patch)
tree3b040ac9594a6ef78d9ddfc83c61847d5eb4b752
parentcf631ddbdceec49579a658698f11679a29cea579 (diff)
downloadgitlab-ce-40465-update-timeago-js.tar.gz
Updated timeago.js40465-update-timeago-js
-rw-r--r--package.json2
-rw-r--r--yarn.lock12
2 files changed, 10 insertions, 4 deletions
diff --git a/package.json b/package.json
index 8eb38f28cee..565252bd610 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,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 600e8e75ef6..ce723da3ca1 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"
@@ -6271,9 +6275,11 @@ 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@^2.0.5:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-2.0.5.tgz#730c74fbdb0b0917a553675a4460e3a7f80db86c"
+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"