summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-07-09 17:40:28 +0000
committerMike Greiling <mike@pixelcog.com>2019-07-09 17:40:28 +0000
commit48c19d9e296b2bec3663f46b8d936da2082171b1 (patch)
tree286c1ed2203a7183c2fe6211eea9074df6faa3e5
parente396f0bacbf44720efb9b55609170a9c8e92476e (diff)
parente549a7fb1f364395c20522e5395e22a2bf434ed0 (diff)
downloadgitlab-ce-48c19d9e296b2bec3663f46b8d936da2082171b1.tar.gz
Merge branch '63945-update-mixin-deep-to-1.3.2' into 'master'
Update mixin-deep to 1.3.2 Closes #63945 See merge request gitlab-org/gitlab-ce!30223
-rw-r--r--changelogs/unreleased/63945-update-mixin-deep-to-1-3-2.yml5
-rw-r--r--yarn.lock6
2 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/63945-update-mixin-deep-to-1-3-2.yml b/changelogs/unreleased/63945-update-mixin-deep-to-1-3-2.yml
new file mode 100644
index 00000000000..a0ef34f3700
--- /dev/null
+++ b/changelogs/unreleased/63945-update-mixin-deep-to-1-3-2.yml
@@ -0,0 +1,5 @@
+---
+title: Update mixin-deep to 1.3.2
+merge_request: 30223
+author: Takuya Noguchi
+type: other
diff --git a/yarn.lock b/yarn.lock
index bebc81d6847..dc5e0662396 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7476,9 +7476,9 @@ mississippi@^3.0.0:
through2 "^2.0.0"
mixin-deep@^1.2.0:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
- integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+ integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
dependencies:
for-in "^1.0.2"
is-extendable "^1.0.1"