summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-08-25 13:33:53 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-08-25 13:33:53 +0000
commit0d4b10c43e125c01370dfb04e1741bfe3cea1c6d (patch)
tree70e48d270fd3e9e00da6c388a6616996e5367b4b
parent4822d66f379a86d278756dae2d57bc1acdef0a07 (diff)
downloadgitlab-ce-0d4b10c43e125c01370dfb04e1741bfe3cea1c6d.tar.gz
Update CHANGELOG.md for 13.3.1
[ci skip]
-rw-r--r--CHANGELOG.md8
-rw-r--r--changelogs/unreleased/236190-bugfix-issue-promote-with-attachments.yml5
-rw-r--r--changelogs/unreleased/id-fix-nil-line-codes-for-diff-positions.yml5
3 files changed, 8 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7bb4ac918d..99a0b061a29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.3.1 (2020-08-25)
+
+### Fixed (2 changes)
+
+- Fix bug when promoting an Issue with attachments to an Epic. !39654
+- Avoid creating diff position when line-code is nil. !40089
+
+
## 13.3.0 (2020-08-22)
### Security (2 changes)
diff --git a/changelogs/unreleased/236190-bugfix-issue-promote-with-attachments.yml b/changelogs/unreleased/236190-bugfix-issue-promote-with-attachments.yml
deleted file mode 100644
index 4102c0649d3..00000000000
--- a/changelogs/unreleased/236190-bugfix-issue-promote-with-attachments.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix bug when promoting an Issue with attachments to an Epic
-merge_request: 39654
-author:
-type: fixed
diff --git a/changelogs/unreleased/id-fix-nil-line-codes-for-diff-positions.yml b/changelogs/unreleased/id-fix-nil-line-codes-for-diff-positions.yml
deleted file mode 100644
index 1d7b495e8f0..00000000000
--- a/changelogs/unreleased/id-fix-nil-line-codes-for-diff-positions.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Avoid creating diff position when line-code is nil
-merge_request: 40089
-author:
-type: fixed