From 65f27de7a2415bc50bebdb5f0cc8613fe87f8daf Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Mon, 23 Jul 2018 13:31:40 +0000 Subject: Update CHANGELOG.md for 11.1.1 [ci skip] --- CHANGELOG.md | 12 ++++++++++++ ...ail-when-uploads-have-been-migrated-to-object-storage.yml | 5 ----- changelogs/unreleased/fix-filename-for-direct-uploads.yml | 5 ----- changelogs/unreleased/gitaly-ff-branch-nil.yml | 5 ----- 4 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 changelogs/unreleased/48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage.yml delete mode 100644 changelogs/unreleased/fix-filename-for-direct-uploads.yml delete mode 100644 changelogs/unreleased/gitaly-ff-branch-nil.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 76a016b233c..7cc047c40ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 11.1.1 (2018-07-23) + +### Fixed (2 changes) + +- Add missing Gitaly branch_update nil checks. !20711 +- Fix filename for accelerated uploads. + +### Added (1 change) + +- Add uploader support to Import/Export uploads. !20484 + + ## 11.1.0 (2018-07-22) ### Security (6 changes) diff --git a/changelogs/unreleased/48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage.yml b/changelogs/unreleased/48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage.yml deleted file mode 100644 index 7552e0d3878..00000000000 --- a/changelogs/unreleased/48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add uploader support to Import/Export uploads -merge_request: 20484 -author: -type: added diff --git a/changelogs/unreleased/fix-filename-for-direct-uploads.yml b/changelogs/unreleased/fix-filename-for-direct-uploads.yml deleted file mode 100644 index a1bbf3704c0..00000000000 --- a/changelogs/unreleased/fix-filename-for-direct-uploads.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix filename for accelerated uploads -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/gitaly-ff-branch-nil.yml b/changelogs/unreleased/gitaly-ff-branch-nil.yml deleted file mode 100644 index e7e689e6053..00000000000 --- a/changelogs/unreleased/gitaly-ff-branch-nil.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add missing Gitaly branch_update nil checks -merge_request: 20711 -author: -type: fixed -- cgit v1.2.1