Merge branch '11-9-stable-patch-6' into '11-9-stable'

Prepare 11.9.6 release

See merge request gitlab-org/gitlab-ce!26942

6 files changed, 28 insertions, 17 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f33e47a7234..8ac10dfa7be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -244,8 +244,8 @@ package-and-qa:
     - ./scripts/trigger-build omnibus
   when: manual
   only:
-    - //@gitlab-org/gitlab-ce
-    - //@gitlab-org/gitlab-ee
+    - /.+/@gitlab-org/gitlab-ce
+    - /.+/@gitlab-org/gitlab-ee
 
 # Review docs base
 .review-docs: &review-docs
@@ -675,10 +675,10 @@ gitlab:assets:compile:
       - public/assets/
   <<: *assets-compile-cache
   only:
-    - //@gitlab-org/gitlab-ce
-    - //@gitlab-org/gitlab-ee
-    - //@gitlab/gitlabhq
-    - //@gitlab/gitlab-ee
+    - /.+/@gitlab-org/gitlab-ce
+    - /.+/@gitlab-org/gitlab-ee
+    - /.+/@gitlab/gitlabhq
+    - /.+/@gitlab/gitlab-ee
   tags:
     - docker
     - gitlab-org
@@ -997,7 +997,7 @@ no_ee_check:
   script:
     - scripts/no-ee-check
   only:
-    - //@gitlab-org/gitlab-ce
+    - /.+/@gitlab-org/gitlab-ce
 
 # GitLab Review apps
 .review-build-cng-base: &review-build-cng-base
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15d6a0647a1..f02377ab3ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,16 +4,7 @@ entry.
 
 ## 11.9.5 (2019-04-03)
 
-### Fixed (3 changes)
-
-- Force to recreate all MR diffs on import. !26480
-- Fix API /project/:id/branches not returning correct merge status. !26785
-- Avoid excessive recursive calls with Rugged TreeEntries. !26813
-
-### Performance (1 change)
-
-- Force a full GC after importing a project. !26803
-
+- Unreleased due to QA failure.
 
 ## 11.9.4 (2019-03-28)
 
diff --git a/changelogs/unreleased/recreate-all-diffs-on-import.yml b/changelogs/unreleased/recreate-all-diffs-on-import.yml
new file mode 100644
index 00000000000..fd9124372f3
--- /dev/null
+++ b/changelogs/unreleased/recreate-all-diffs-on-import.yml
@@ -0,0 +1,5 @@
+---
+title: Force to recreate all MR diffs on import
+merge_request: 26480
+author:
+type: fixed
diff --git a/changelogs/unreleased/sh-fix-project-branches-merge-status.yml b/changelogs/unreleased/sh-fix-project-branches-merge-status.yml
new file mode 100644
index 00000000000..65f41b3faf9
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-project-branches-merge-status.yml
@@ -0,0 +1,5 @@
+---
+title: Fix API /project/:id/branches not returning correct merge status
+merge_request: 26785
+author:
+type: fixed
diff --git a/changelogs/unreleased/sh-fix-rugged-tree-entries.yml b/changelogs/unreleased/sh-fix-rugged-tree-entries.yml
new file mode 100644
index 00000000000..97b27678905
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-rugged-tree-entries.yml
@@ -0,0 +1,5 @@
+---
+title: Avoid excessive recursive calls with Rugged TreeEntries
+merge_request: 26813
+author:
+type: fixed
diff --git a/changelogs/unreleased/sh-force-gc-after-import.yml b/changelogs/unreleased/sh-force-gc-after-import.yml
new file mode 100644
index 00000000000..755d66c1607
--- /dev/null
+++ b/changelogs/unreleased/sh-force-gc-after-import.yml
@@ -0,0 +1,5 @@
+---
+title: Force a full GC after importing a project
+merge_request: 26803
+author:
+type: performance