summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2018-01-02 16:03:04 +0000
committerTiago Botelho <tiagonbotelho@hotmail.com>2018-01-02 16:03:04 +0000
commitf4c4bc975ad01dec9260c7d45fd6d21383f12149 (patch)
tree6ec1ffe67f13f3373c00c51e8b61acba12ad04fa
parent1dac4271798a3b9ad36c3d985a3f7740cd1c60b3 (diff)
downloadgitlab-ce-f4c4bc975ad01dec9260c7d45fd6d21383f12149.tar.gz
Update CHANGELOG.md for 10.3.3
[ci skip]
-rw-r--r--CHANGELOG.md9
-rw-r--r--changelogs/unreleased/41492-mr-comment-fix.yml5
-rw-r--r--changelogs/unreleased/sh-fix-spam-update-404.yml5
-rw-r--r--changelogs/unreleased/sh-handle-orphaned-deploy-keys.yml5
4 files changed, 9 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b716dd4bf13..26580e7183f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.3.3 (2018-01-02)
+
+### Fixed (3 changes)
+
+- Fix links to old commits in merge request comments.
+- Fix 404 errors after a user edits an issue description and solves the reCAPTCHA.
+- Gracefully handle orphaned write deploy keys in /internal/post_receive.
+
+
## 10.3.2 (2017-12-28)
### Fixed (1 change)
diff --git a/changelogs/unreleased/41492-mr-comment-fix.yml b/changelogs/unreleased/41492-mr-comment-fix.yml
deleted file mode 100644
index 45ddc16aad0..00000000000
--- a/changelogs/unreleased/41492-mr-comment-fix.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix links to old commits in merge request comments
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-spam-update-404.yml b/changelogs/unreleased/sh-fix-spam-update-404.yml
deleted file mode 100644
index 13daec35ecf..00000000000
--- a/changelogs/unreleased/sh-fix-spam-update-404.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix 404 errors after a user edits an issue description and solves the reCAPTCHA
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-handle-orphaned-deploy-keys.yml b/changelogs/unreleased/sh-handle-orphaned-deploy-keys.yml
deleted file mode 100644
index 7d3b622534e..00000000000
--- a/changelogs/unreleased/sh-handle-orphaned-deploy-keys.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Gracefully handle orphaned write deploy keys in /internal/post_receive
-merge_request:
-author:
-type: fixed