summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2016-05-30 17:41:27 -0300
committerGabriel Mazetto <gabriel@gitlab.com>2016-05-30 17:41:27 -0300
commitab17e4b74f0c607c4ddd4c160e2848819170551c (patch)
treeac08d6839779eea11e75fc386b09b94ad3ca6fa2
parent6506a9dd4433a261531613b344c3307159cd7d72 (diff)
downloadgitlab-ce-ab17e4b74f0c607c4ddd4c160e2848819170551c.tar.gz
Small fixes and added to the changelogpatch/wiki_page_events
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/projects/hooks/index.html.haml2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3e8b0a2af01..2dadbf7d502 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 8.9.0 (unreleased)
+ - Allow enabling wiki page events from Webhook management UI
- Allow forking projects with restricted visibility level
- Improve note validation to prevent errors when creating invalid note via API
- Redesign navigation for project pages
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index e4092f761d8..917a0b805b1 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -68,7 +68,7 @@
= f.check_box :wiki_page_events, class: 'pull-left'
.prepend-left-20
= f.label :wiki_page_events, class: 'label-light append-bottom-0' do
- %strong Wiki Page events
+ Wiki Page events
%p.light
This url will be triggered when a wiki page is created/updated
.form-group