From 9274463812106e920459b774d3cf889e45905d8f Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 4 Jun 2019 16:09:18 +0000 Subject: Update CHANGELOG.md for 11.11.2 [ci skip] --- CHANGELOG.md | 17 +++++++++++++++++ changelogs/unreleased/jp-label-fix.yml | 5 ----- changelogs/unreleased/patch-64.yml | 5 ----- changelogs/unreleased/sh-fix-import-url-update.yml | 5 ----- changelogs/unreleased/sh-fix-issue-58714.yml | 5 ----- .../unreleased/sh-fix-omniauth-generic-strategy.yml | 5 ----- changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml | 5 ----- 7 files changed, 17 insertions(+), 30 deletions(-) delete mode 100644 changelogs/unreleased/jp-label-fix.yml delete mode 100644 changelogs/unreleased/patch-64.yml delete mode 100644 changelogs/unreleased/sh-fix-import-url-update.yml delete mode 100644 changelogs/unreleased/sh-fix-issue-58714.yml delete mode 100644 changelogs/unreleased/sh-fix-omniauth-generic-strategy.yml delete mode 100644 changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index c52d26d4d1d..fd9c4df2f3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,23 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 11.11.2 (2019-06-04) + +### Fixed (7 changes) + +- Update SAST.gitlab-ci.yml - Add SAST_GITLEAKS_ENTROPY_LEVEL. !28607 +- Fix OmniAuth OAuth2Generic strategy not loading. !28680 +- Use source ref in pipeline webhook. !28772 +- Fix migration failure when groups are missing route. !29022 +- Stop two-step rebase from hanging when errors occur. !29068 +- Fix project settings not being able to update. !29097 +- Fix display of 'Promote to group label' button. + +### Other (1 change) + +- Fix input group height. + + ## 11.11.0 (2019-05-22) ### Security (1 change) diff --git a/changelogs/unreleased/jp-label-fix.yml b/changelogs/unreleased/jp-label-fix.yml deleted file mode 100644 index de64286cc1f..00000000000 --- a/changelogs/unreleased/jp-label-fix.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix display of 'Promote to group label' button. -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/patch-64.yml b/changelogs/unreleased/patch-64.yml deleted file mode 100644 index 1bf022e7e41..00000000000 --- a/changelogs/unreleased/patch-64.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update SAST.gitlab-ci.yml - Add SAST_GITLEAKS_ENTROPY_LEVEL -merge_request: 28607 -author: -type: fixed diff --git a/changelogs/unreleased/sh-fix-import-url-update.yml b/changelogs/unreleased/sh-fix-import-url-update.yml deleted file mode 100644 index d143bd3473a..00000000000 --- a/changelogs/unreleased/sh-fix-import-url-update.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix project settings not being able to update -merge_request: 29097 -author: -type: fixed diff --git a/changelogs/unreleased/sh-fix-issue-58714.yml b/changelogs/unreleased/sh-fix-issue-58714.yml deleted file mode 100644 index 597a011b6f3..00000000000 --- a/changelogs/unreleased/sh-fix-issue-58714.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix migration failure when groups are missing route -merge_request: 29022 -author: -type: fixed diff --git a/changelogs/unreleased/sh-fix-omniauth-generic-strategy.yml b/changelogs/unreleased/sh-fix-omniauth-generic-strategy.yml deleted file mode 100644 index 561c19c9685..00000000000 --- a/changelogs/unreleased/sh-fix-omniauth-generic-strategy.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix OmniAuth OAuth2Generic strategy not loading -merge_request: 28680 -author: -type: fixed diff --git a/changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml b/changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml deleted file mode 100644 index 24fadbe3814..00000000000 --- a/changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Stop two-step rebase from hanging when errors occur -merge_request: 29068 -author: -type: fixed -- cgit v1.2.1