summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-14 10:26:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-14 10:26:13 +0000
commit4588bbc93a7857eb2d031a4f3e0212c0aa46b846 (patch)
tree1c1c9795491b5e6a97a5e8b5f00e4e2dcc99e5a1 /changelogs
parent8236147d0fcb9f4f8c315f895aebc0c8158e2f7d (diff)
downloadgitlab-ce-4588bbc93a7857eb2d031a4f3e0212c0aa46b846.tar.gz
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/246741-conan-unicorn-bug.yml5
-rw-r--r--changelogs/unreleased/fix-bump-ado-image-to-1-0-3.yml6
2 files changed, 11 insertions, 0 deletions
diff --git a/changelogs/unreleased/246741-conan-unicorn-bug.yml b/changelogs/unreleased/246741-conan-unicorn-bug.yml
new file mode 100644
index 00000000000..669550c1c81
--- /dev/null
+++ b/changelogs/unreleased/246741-conan-unicorn-bug.yml
@@ -0,0 +1,5 @@
+---
+title: Use 'read' method to get request body in Conan to fix uploads when using Unicorn
+merge_request: 41801
+author:
+type: fixed
diff --git a/changelogs/unreleased/fix-bump-ado-image-to-1-0-3.yml b/changelogs/unreleased/fix-bump-ado-image-to-1-0-3.yml
new file mode 100644
index 00000000000..6000a9f493d
--- /dev/null
+++ b/changelogs/unreleased/fix-bump-ado-image-to-1-0-3.yml
@@ -0,0 +1,6 @@
+---
+title: Fixes Auto DevOps deploy script for multiple additional hosts separated by
+ comma and space
+merge_request: 41404
+author:
+type: fixed