summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-13 15:07:53 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-13 15:07:53 +0000
commita5ab3467a705b62911feacc3cf627fdbb00aa198 (patch)
tree65143ce13405efccb922fc428624ad57c38b6efa /changelogs
parenteb30dd6e28f6fc9eb8021d205f6ed84511f001e2 (diff)
downloadgitlab-ce-a5ab3467a705b62911feacc3cf627fdbb00aa198.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/37359-cablett-support-envelope-to.yml5
-rw-r--r--changelogs/unreleased/bvl-gitaly-dynamic-deadline.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/37359-cablett-support-envelope-to.yml b/changelogs/unreleased/37359-cablett-support-envelope-to.yml
new file mode 100644
index 00000000000..510ebe1c32d
--- /dev/null
+++ b/changelogs/unreleased/37359-cablett-support-envelope-to.yml
@@ -0,0 +1,5 @@
+---
+title: Accept `Envelope-To` as possible location for Service Desk key
+merge_request: 22354
+author: Max Winterstein
+type: added
diff --git a/changelogs/unreleased/bvl-gitaly-dynamic-deadline.yml b/changelogs/unreleased/bvl-gitaly-dynamic-deadline.yml
new file mode 100644
index 00000000000..e44127ccf60
--- /dev/null
+++ b/changelogs/unreleased/bvl-gitaly-dynamic-deadline.yml
@@ -0,0 +1,5 @@
+---
+title: Don't let Gitaly calls exceed a request time of 55 seconds
+merge_request: 21492
+author:
+type: performance