summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md12
-rw-r--r--changelogs/unreleased/sh-conditional-system-hook-push.yml5
-rw-r--r--changelogs/unreleased/sh-fix-broken-ldap-clones.yml5
-rw-r--r--changelogs/unreleased/sh-fix-wrong-commit-count-in-push.yml5
4 files changed, 12 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aee36bb6df3..256dd913435 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 11.2.1 (2018-08-22)
+
+### Fixed (2 changes)
+
+- Fix wrong commit count in push event payload. !21338
+- Fix broken Git over HTTP clones with LDAP users. !21352
+
+### Performance (1 change)
+
+- Eliminate unnecessary and duplicate system hook fires. !21337
+
+
## 11.2.0 (2018-08-22)
### Security (5 changes)
diff --git a/changelogs/unreleased/sh-conditional-system-hook-push.yml b/changelogs/unreleased/sh-conditional-system-hook-push.yml
deleted file mode 100644
index 3a1a1b3d36c..00000000000
--- a/changelogs/unreleased/sh-conditional-system-hook-push.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Eliminate unnecessary and duplicate system hook fires
-merge_request: 21337
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-fix-broken-ldap-clones.yml b/changelogs/unreleased/sh-fix-broken-ldap-clones.yml
deleted file mode 100644
index abe725924f2..00000000000
--- a/changelogs/unreleased/sh-fix-broken-ldap-clones.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix broken Git over HTTP clones with LDAP users
-merge_request: 21352
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-wrong-commit-count-in-push.yml b/changelogs/unreleased/sh-fix-wrong-commit-count-in-push.yml
deleted file mode 100644
index 4af1e980b41..00000000000
--- a/changelogs/unreleased/sh-fix-wrong-commit-count-in-push.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix wrong commit count in push event payload
-merge_request: 21338
-author:
-type: fixed