diff options
9 files changed, 17 insertions, 40 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a1c80afdc8..fe6a382abb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,23 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 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.5 (2019-05-30) ### Security (12 changes, 1 of them is from the community) 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/61203-fix-lfs-ui-upload.yml b/changelogs/unreleased/61203-fix-lfs-ui-upload.yml deleted file mode 100644 index 66afe9f0597..00000000000 --- a/changelogs/unreleased/61203-fix-lfs-ui-upload.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix uploading of LFS tracked file through UI -merge_request: 28052 -author: -type: fixed diff --git a/changelogs/unreleased/fix-project-visibility-level-validation.yml b/changelogs/unreleased/fix-project-visibility-level-validation.yml deleted file mode 100644 index 9581a475842..00000000000 --- a/changelogs/unreleased/fix-project-visibility-level-validation.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix project visibility level validation -merge_request: 28305 -author: Peter Marko -type: fixed diff --git a/changelogs/unreleased/sh-allow-equal-level-in-subgroup-membership.yml b/changelogs/unreleased/sh-allow-equal-level-in-subgroup-membership.yml deleted file mode 100644 index adbed52db81..00000000000 --- a/changelogs/unreleased/sh-allow-equal-level-in-subgroup-membership.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow a member to have an access level equal to parent group -merge_request: 27913 -author: -type: fixed diff --git a/changelogs/unreleased/sh-fix-related-merge-requests-path.yml b/changelogs/unreleased/sh-fix-related-merge-requests-path.yml deleted file mode 100644 index 4b4108feda4..00000000000 --- a/changelogs/unreleased/sh-fix-related-merge-requests-path.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use a path for the related merge requests endpoint -merge_request: 28171 -author: -type: fixed diff --git a/changelogs/unreleased/sh-fix-rugged-get-tree-entries-recursive.yml b/changelogs/unreleased/sh-fix-rugged-get-tree-entries-recursive.yml deleted file mode 100644 index a9d46c6f460..00000000000 --- a/changelogs/unreleased/sh-fix-rugged-get-tree-entries-recursive.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix Rugged get_tree_entries recursive flag not working -merge_request: 28494 -author: -type: fixed diff --git a/changelogs/unreleased/sh-gitaly-update-for-11-10.yml b/changelogs/unreleased/sh-gitaly-update-for-11-10.yml deleted file mode 100644 index 5a61d5db43e..00000000000 --- a/changelogs/unreleased/sh-gitaly-update-for-11-10.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use 3-way merge for squashing commits -merge_request: 28078 -author: -type: fixed 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 |