summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-10-29 19:59:11 +0000
committerMike Greiling <mike@pixelcog.com>2018-10-29 19:59:11 +0000
commitf1f8548f8314ec9ff9d3a06815ab5dc53bac75c6 (patch)
tree3fa984eef145c89096e089d1f75ecc2261bff46d
parent44a6b8d4f7feb8ba42981526379e8395fdd6f67e (diff)
parent04e516d486173a0b35ac71f55c552327bed10d88 (diff)
downloadgitlab-ce-f1f8548f8314ec9ff9d3a06815ab5dc53bac75c6.tar.gz
Merge branch '53273-update-moment-to-2-22-2' into 'master'
Update moment to 2.22.2 Closes #53273 See merge request gitlab-org/gitlab-ce!22648
-rw-r--r--changelogs/unreleased/53273-update-moment-to-2-22-2.yml5
-rw-r--r--yarn.lock7
2 files changed, 6 insertions, 6 deletions
diff --git a/changelogs/unreleased/53273-update-moment-to-2-22-2.yml b/changelogs/unreleased/53273-update-moment-to-2-22-2.yml
new file mode 100644
index 00000000000..a6b40466927
--- /dev/null
+++ b/changelogs/unreleased/53273-update-moment-to-2-22-2.yml
@@ -0,0 +1,5 @@
+---
+title: Update moment to 2.22.2
+merge_request: 22648
+author: Takuya Noguchi
+type: security
diff --git a/yarn.lock b/yarn.lock
index 5da401c1d43..57901d50c2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5502,12 +5502,7 @@ mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
dependencies:
minimist "0.0.8"
-moment@2.x:
- version "2.19.2"
- resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.2.tgz#8a7f774c95a64550b4c7ebd496683908f9419dbe"
- integrity sha512-Rf6jiHPEfxp9+dlzxPTmRHbvoFXsh2L/U8hOupUMpnuecHQmI6cF6lUbJl3QqKPko1u6ujO+FxtcajLVfLpAtA==
-
-moment@^2.21.0:
+moment@2.x, moment@^2.21.0:
version "2.22.2"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=