Commit c3f4ae85 authored by John Skarbek's avatar John Skarbek

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

Prepare 11.9.6 release

See merge request gitlab-org/gitlab-ce!26942
parents f621ab63 df2c6ccb
......@@ -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
......
......@@ -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)
......
---
title: Force to recreate all MR diffs on import
merge_request: 26480
author:
type: fixed
---
title: Fix API /project/:id/branches not returning correct merge status
merge_request: 26785
author:
type: fixed
---
title: Avoid excessive recursive calls with Rugged TreeEntries
merge_request: 26813
author:
type: fixed
---
title: Force a full GC after importing a project
merge_request: 26803
author:
type: performance
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment