From 9b039684e7260baf6bfc6f6be3d3be28a30e2c89 Mon Sep 17 00:00:00 2001 From: Jose Ivan Vargas Date: Mon, 28 Aug 2017 12:27:01 -0500 Subject: Update CHANGELOG.md for 9.5.2 [ci skip] --- CHANGELOG.md | 9 +++++++++ changelogs/unreleased/dm-ldap-adapter-attributes.yml | 6 ------ changelogs/unreleased/fix-old-mr-diffs.yml | 6 ------ changelogs/unreleased/fix-push-events-branch-removals.yml | 5 ----- .../rd-fix-broken-configuration-for-some-integrations.yml | 5 ----- changelogs/unreleased/sh-system-hooks-ldap-users.yml | 5 ----- changelogs/unreleased/zj-fix-fe-blank-button.yml | 5 ----- 7 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 changelogs/unreleased/dm-ldap-adapter-attributes.yml delete mode 100644 changelogs/unreleased/fix-old-mr-diffs.yml delete mode 100644 changelogs/unreleased/fix-push-events-branch-removals.yml delete mode 100644 changelogs/unreleased/rd-fix-broken-configuration-for-some-integrations.yml delete mode 100644 changelogs/unreleased/sh-system-hooks-ldap-users.yml delete mode 100644 changelogs/unreleased/zj-fix-fe-blank-button.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a4cad70345..7da8f839a8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 9.5.2 (2017-08-28) + +- [FIXED] Fix signing in using LDAP when attribute mapping uses simple strings instead of arrays. +- [FIXED] Show un-highlighted text diffs when we do not have references to the correct blobs. +- [FIXED] Fix display of push events for removed refs. +- [FIXED] Testing of some integrations were broken due to missing ServiceHook record. +- [FIXED] Fire system hooks when a user is created via LDAP. +- [FIXED] Fix new project form not resetting the template value. + ## 9.5.1 (2017-08-23) - [FIXED] Fix merge request pipeline status when pipeline has errors. !13664 diff --git a/changelogs/unreleased/dm-ldap-adapter-attributes.yml b/changelogs/unreleased/dm-ldap-adapter-attributes.yml deleted file mode 100644 index edd68ef08e7..00000000000 --- a/changelogs/unreleased/dm-ldap-adapter-attributes.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Fix signing in using LDAP when attribute mapping uses simple strings instead - of arrays -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix-old-mr-diffs.yml b/changelogs/unreleased/fix-old-mr-diffs.yml deleted file mode 100644 index b0a011cf354..00000000000 --- a/changelogs/unreleased/fix-old-mr-diffs.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Show un-highlighted text diffs when we do not have references to the correct - blobs -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix-push-events-branch-removals.yml b/changelogs/unreleased/fix-push-events-branch-removals.yml deleted file mode 100644 index 71f368db296..00000000000 --- a/changelogs/unreleased/fix-push-events-branch-removals.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix display of push events for removed refs -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/rd-fix-broken-configuration-for-some-integrations.yml b/changelogs/unreleased/rd-fix-broken-configuration-for-some-integrations.yml deleted file mode 100644 index 00528397d64..00000000000 --- a/changelogs/unreleased/rd-fix-broken-configuration-for-some-integrations.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Testing of some integrations were broken due to missing ServiceHook record. -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/sh-system-hooks-ldap-users.yml b/changelogs/unreleased/sh-system-hooks-ldap-users.yml deleted file mode 100644 index 87514ec00ea..00000000000 --- a/changelogs/unreleased/sh-system-hooks-ldap-users.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fire system hooks when a user is created via LDAP -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/zj-fix-fe-blank-button.yml b/changelogs/unreleased/zj-fix-fe-blank-button.yml deleted file mode 100644 index 2165d4186c1..00000000000 --- a/changelogs/unreleased/zj-fix-fe-blank-button.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix new project form not resetting the template value -merge_request: -author: -type: fixed -- cgit v1.2.3