summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2018-07-23 13:31:39 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2018-07-23 13:31:39 +0000
commit6e60f3cffbc1646923203ef9e49771cb72dfc61d (patch)
tree7b1641b5ef13357eb69df56f0adac1784258affb
parent7abb2f7ff201bda6d78efbb6f34f3ebbf52e11f7 (diff)
downloadgitlab-ce-6e60f3cffbc1646923203ef9e49771cb72dfc61d.tar.gz
Update CHANGELOG.md for 11.1.1
[ci skip]
-rw-r--r--CHANGELOG.md12
-rw-r--r--changelogs/unreleased/48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage.yml5
-rw-r--r--changelogs/unreleased/fix-filename-for-direct-uploads.yml5
-rw-r--r--changelogs/unreleased/gitaly-ff-branch-nil.yml5
4 files changed, 12 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c10c0131862..c7780abbaa4 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