summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2019-04-23 16:57:11 +0000
committerMarin Jankovski <marin@gitlab.com>2019-04-23 16:57:11 +0000
commit9f5060bdd3f8c90359ab6e9daa45be63e834dcac (patch)
treeb13051f7c909a213d9819e8ec89617ab25c2b70c /changelogs
parent208890f11f8e957e1c780777c2225282ff0ed6dc (diff)
parentb93b23cb403c8dd4b0a9e9ac89110d99e46a3e68 (diff)
downloadgitlab-ce-9f5060bdd3f8c90359ab6e9daa45be63e834dcac.tar.gz
Merge branch '11-8-stable-patch-8' into '11-8-stable'
Prepare 11.8.8 release See merge request gitlab-org/gitlab-ce!27573
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/fj-58804-fix-bitbucket-import.yml5
-rw-r--r--changelogs/unreleased/sh-handle-null-bytes-in-merge-request-diffs.yml5
-rw-r--r--changelogs/unreleased/sh-revert-rack-request-health-checks.yml5
3 files changed, 15 insertions, 0 deletions
diff --git a/changelogs/unreleased/fj-58804-fix-bitbucket-import.yml b/changelogs/unreleased/fj-58804-fix-bitbucket-import.yml
new file mode 100644
index 00000000000..dc44c64a055
--- /dev/null
+++ b/changelogs/unreleased/fj-58804-fix-bitbucket-import.yml
@@ -0,0 +1,5 @@
+---
+title: Fix bug in BitBucket imports with SHA shorter than 40 chars
+merge_request: 26050
+author:
+type: fixed
diff --git a/changelogs/unreleased/sh-handle-null-bytes-in-merge-request-diffs.yml b/changelogs/unreleased/sh-handle-null-bytes-in-merge-request-diffs.yml
new file mode 100644
index 00000000000..01b6b08b61b
--- /dev/null
+++ b/changelogs/unreleased/sh-handle-null-bytes-in-merge-request-diffs.yml
@@ -0,0 +1,5 @@
+---
+title: Fix error creating a merge request when diff includes a null byte
+merge_request: 26190
+author:
+type: fixed
diff --git a/changelogs/unreleased/sh-revert-rack-request-health-checks.yml b/changelogs/unreleased/sh-revert-rack-request-health-checks.yml
new file mode 100644
index 00000000000..5dd5e5b731c
--- /dev/null
+++ b/changelogs/unreleased/sh-revert-rack-request-health-checks.yml
@@ -0,0 +1,5 @@
+---
+title: Fix health checks not working behind load balancers
+merge_request: 26055
+author:
+type: fixed