diff --git a/CHANGELOG.md b/CHANGELOG.md index 76a016b233c72549f54bc9a8634bafffdd2f9a6c..7cc047c40ed9fdae828b637929e26bcc2dd79dd6 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 7552e0d38781b3ea3d79ec3d76fe36cde4971a6b..0000000000000000000000000000000000000000 --- 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 a1bbf3704c0c7f26f6633ba5f7a7dc56ab801d30..0000000000000000000000000000000000000000 --- 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 e7e689e605394bd4d89ea4dd804464d5a9706fb6..0000000000000000000000000000000000000000 --- 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