summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-23 16:32:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-23 16:32:38 +0000
commit8b7c4494871c7d69ac7bc59839bdce6ff2937f95 (patch)
treea667b3ec0df2034ade9cc9634af7eb3502f1a2bf
parent573359028f908ed4c40b15e050dd8e8dcfb03c6e (diff)
downloadgitlab-ce-8b7c4494871c7d69ac7bc59839bdce6ff2937f95.tar.gz
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
-rw-r--r--changelogs/unreleased/13-1-stable-ee-update-dependency.yml5
-rw-r--r--package.json4
-rw-r--r--yarn.lock18
3 files changed, 16 insertions, 11 deletions
diff --git a/changelogs/unreleased/13-1-stable-ee-update-dependency.yml b/changelogs/unreleased/13-1-stable-ee-update-dependency.yml
new file mode 100644
index 00000000000..9fa3607c584
--- /dev/null
+++ b/changelogs/unreleased/13-1-stable-ee-update-dependency.yml
@@ -0,0 +1,5 @@
+---
+title: Fix edit status dropdown overflow
+merge_request: 34847
+author:
+type: fixed
diff --git a/package.json b/package.json
index 99614c0acc3..790850c68cd 100644
--- a/package.json
+++ b/package.json
@@ -40,8 +40,8 @@
"@babel/plugin-syntax-import-meta": "^7.10.1",
"@babel/preset-env": "^7.10.1",
"@gitlab/at.js": "1.5.5",
- "@gitlab/svgs": "1.139.0",
- "@gitlab/ui": "16.12.1",
+ "@gitlab/svgs": "1.140.0",
+ "@gitlab/ui": "17.0.1",
"@gitlab/visual-review-tools": "1.6.1",
"@rails/actioncable": "^6.0.3-1",
"@sentry/browser": "^5.10.2",
diff --git a/yarn.lock b/yarn.lock
index 3b3766f540a..79aed65f8e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -835,15 +835,15 @@
eslint-plugin-vue "^6.2.1"
vue-eslint-parser "^7.0.0"
-"@gitlab/svgs@1.139.0":
- version "1.139.0"
- resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.139.0.tgz#8a4874e76000e2dd7d3ed3a8967d62bed47d7ea7"
- integrity sha512-o1KAmQLYL727HodlPHkmj+d+Kdw8OIgHzlKmmPYMzeE+As2l1oz6CTilca56KqXGklOgrouC9P2puMwyX8e/6g==
-
-"@gitlab/ui@16.12.1":
- version "16.12.1"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-16.12.1.tgz#4d6865308596b09e36961210df7a8a489aaadb6d"
- integrity sha512-jF6/I71Q0mjHetIRDO8O4VO2KIGWKL/yH2Mdb/CqQKaEasgnc/YpuyHGCsBXqDPxCjRbXPeKp0EywICQx4agZA==
+"@gitlab/svgs@1.140.0":
+ version "1.140.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.140.0.tgz#593f1f65b0df57c3399fcfb9f472f59aa64da074"
+ integrity sha512-6gANJGi2QkpvOgFTMcY3SIwEqhO69i6R3jU4BSskkVziwDdAWxGonln22a4Iu//Iv0NrsFDpAA0jIVfnJzw0iA==
+
+"@gitlab/ui@17.0.1":
+ version "17.0.1"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-17.0.1.tgz#daf036dfdc095f94123c80c3fb1ab5fe4dcbf95b"
+ integrity sha512-JSUGruV6oploADF0Sc0BBY43Des3utU9iWCnR8BAmttKFXFFNUKwTf908yZPGJtfnVyjJkVioOCOYkvUZ0jngg==
dependencies:
"@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.3.0"