From b2a560a7c75ce28fd068b70296c9d0fafdace7cf Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 4 Jun 2019 15:42:26 +0000 Subject: Update CHANGELOG.md for 11.10.6 [ci skip] --- CHANGELOG.md | 17 +++++++++++++++++ changelogs/unreleased/60778-input-text-height.yml | 5 ----- .../unreleased/use-source-ref-name-in-webhook.yml | 5 ----- 3 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 changelogs/unreleased/60778-input-text-height.yml delete mode 100644 changelogs/unreleased/use-source-ref-name-in-webhook.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index c31af2488f0..c52d26d4d1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -187,6 +187,23 @@ entry. - Add some frozen string to spec/**/*.rb. (gfyoung) +## 11.10.6 (2019-06-04) + +### Fixed (7 changes, 1 of them is from the community) + +- Allow a member to have an access level equal to parent group. !27913 +- Fix uploading of LFS tracked file through UI. !28052 +- Use 3-way merge for squashing commits. !28078 +- Use a path for the related merge requests endpoint. !28171 +- Fix project visibility level validation. !28305 (Peter Marko) +- Fix Rugged get_tree_entries recursive flag not working. !28494 +- Use source ref in pipeline webhook. !28772 + +### Other (1 change) + +- Fix input group height. + + ## 11.10.4 (2019-05-01) ### Fixed (12 changes) diff --git a/changelogs/unreleased/60778-input-text-height.yml b/changelogs/unreleased/60778-input-text-height.yml deleted file mode 100644 index c956ead5db2..00000000000 --- a/changelogs/unreleased/60778-input-text-height.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix input group height -merge_request: -author: -type: other diff --git a/changelogs/unreleased/use-source-ref-name-in-webhook.yml b/changelogs/unreleased/use-source-ref-name-in-webhook.yml deleted file mode 100644 index 1a5c56d79ca..00000000000 --- a/changelogs/unreleased/use-source-ref-name-in-webhook.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use source ref in pipeline webhook -merge_request: 28772 -author: -type: fixed -- cgit v1.2.3