summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-24 18:18:05 +0000
committerRobert Speicher <robert@gitlab.com>2016-08-24 18:18:05 +0000
commitb13dba7f25170e2f4d0b9a092c3a47851a504f48 (patch)
tree83ce47eb8d7761206d29467a1aa2cce7f1c3ead7 /CHANGELOG
parentc86c7223e235e2a64c7d35b0fe352f8f56db7f32 (diff)
parent99c2f3b3c534386d1d8258fea23d3991695ff4fe (diff)
downloadgitlab-ce-b13dba7f25170e2f4d0b9a092c3a47851a504f48.tar.gz
Merge branch 'api-project-hook-wiki-page-events' into 'master'
Api project hook wiki page events ## What does this MR do? Updates project hook API for wiki page events. Also updates docs and tests for forgotten hook fields. See merge request !5969
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 65796fd808c..0383f33a6ef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.12.0 (unreleased)
- Change merge_error column from string to text type
- Optimistic locking for Issues and Merge Requests (title and description overriding prevention)
+ - Add `wiki_page_events` to project hook APIs (Ben Boeckel)
- Added tests for diff notes
v 8.11.2 (unreleased)