summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2018-10-15 12:51:49 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2018-10-15 12:51:49 +0000
commit072984e02765076735ad84dfa67068999b25ddc3 (patch)
tree26fe71c7af266d429b4a3f894724f0e4e01aa005
parent18d7ec3ea8202b36a3a4833497d4d591fcade0fd (diff)
downloadgitlab-ce-072984e02765076735ad84dfa67068999b25ddc3.tar.gz
Update CHANGELOG.md for 11.3.5
[ci skip]
-rw-r--r--CHANGELOG.md8
-rw-r--r--changelogs/unreleased/51958-fix-mr-discussion-loading.yml5
-rw-r--r--changelogs/unreleased/sh-fix-project-deletion-with-export.yml5
3 files changed, 8 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b345a3f3d1e..11fb3a74eb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 11.3.5 (2018-10-15)
+
+### Fixed (2 changes)
+
+- Fix loading issue on some merge request discussion. !21982
+- Fix project deletion when there is a export available. !22276
+
+
## 11.3.4 (2018-10-05)
### Security (3 changes)
diff --git a/changelogs/unreleased/51958-fix-mr-discussion-loading.yml b/changelogs/unreleased/51958-fix-mr-discussion-loading.yml
deleted file mode 100644
index f80ee51291d..00000000000
--- a/changelogs/unreleased/51958-fix-mr-discussion-loading.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix loading issue on some merge request discussion
-merge_request: 21982
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-project-deletion-with-export.yml b/changelogs/unreleased/sh-fix-project-deletion-with-export.yml
deleted file mode 100644
index b9437f8ad6a..00000000000
--- a/changelogs/unreleased/sh-fix-project-deletion-with-export.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix project deletion when there is a export available
-merge_request: 22276
-author:
-type: fixed