diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-24 18:18:05 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-24 18:18:05 +0000 |
| commit | b13dba7f25170e2f4d0b9a092c3a47851a504f48 (patch) | |
| tree | 83ce47eb8d7761206d29467a1aa2cce7f1c3ead7 /lib/api | |
| parent | c86c7223e235e2a64c7d35b0fe352f8f56db7f32 (diff) | |
| parent | 99c2f3b3c534386d1d8258fea23d3991695ff4fe (diff) | |
| download | gitlab-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 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 2 | ||||
| -rw-r--r-- | lib/api/project_hooks.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 66b85ab1793..3ecdc7d448a 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -49,7 +49,7 @@ module API class ProjectHook < Hook expose :project_id, :push_events expose :issues_events, :merge_requests_events, :tag_push_events - expose :note_events, :build_events, :pipeline_events + expose :note_events, :build_events, :pipeline_events, :wiki_page_events expose :enable_ssl_verification end diff --git a/lib/api/project_hooks.rb b/lib/api/project_hooks.rb index 3f63cd678e8..14f5be3b5f6 100644 --- a/lib/api/project_hooks.rb +++ b/lib/api/project_hooks.rb @@ -46,6 +46,7 @@ module API :note_events, :build_events, :pipeline_events, + :wiki_page_events, :enable_ssl_verification ] @hook = user_project.hooks.new(attrs) @@ -80,6 +81,7 @@ module API :note_events, :build_events, :pipeline_events, + :wiki_page_events, :enable_ssl_verification ] |