diff options
| author | Jean-Baptiste Guerraz <jbguerraz@skilld.fr> | 2018-02-26 18:35:04 +0100 |
|---|---|---|
| committer | Jean-Baptiste Guerraz <jbguerraz@skilld.fr> | 2018-03-01 10:51:56 +0100 |
| commit | 20844326f3eb42692bed0034f726b9bb8a23625e (patch) | |
| tree | a60360910a80dc689a7c161c83c5fc3952634f7f /lib/api/v3 | |
| parent | bac9bb1866f47f0b1515b8705ea9eba1fa9b9ced (diff) | |
| download | gitlab-ce-20844326f3eb42692bed0034f726b9bb8a23625e.tar.gz | |
align "confidential issues events" implementation with "issues events" one
Diffstat (limited to 'lib/api/v3')
| -rw-r--r-- | lib/api/v3/entities.rb | 10 | ||||
| -rw-r--r-- | lib/api/v3/project_hooks.rb | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/api/v3/entities.rb b/lib/api/v3/entities.rb index 2ccbb9da1c5..68b4d7c3982 100644 --- a/lib/api/v3/entities.rb +++ b/lib/api/v3/entities.rb @@ -252,8 +252,9 @@ module API class ProjectService < Grape::Entity expose :id, :title, :created_at, :updated_at, :active - expose :push_events, :issues_events, :merge_requests_events - expose :tag_push_events, :note_events, :pipeline_events + expose :push_events, :issues_events, :confidential_issues_events + expose :merge_requests_events, :tag_push_events, :note_events + expose :pipeline_events expose :job_events, as: :build_events # Expose serialized properties expose :properties do |service, options| @@ -262,8 +263,9 @@ module API end class ProjectHook < ::API::Entities::Hook - expose :project_id, :issues_events, :merge_requests_events - expose :note_events, :pipeline_events, :wiki_page_events + expose :project_id, :issues_events, :confidential_issues_events + expose :merge_requests_events, :note_events, :pipeline_events + expose :wiki_page_events expose :job_events, as: :build_events end diff --git a/lib/api/v3/project_hooks.rb b/lib/api/v3/project_hooks.rb index 51014591a93..631944150c7 100644 --- a/lib/api/v3/project_hooks.rb +++ b/lib/api/v3/project_hooks.rb @@ -11,6 +11,7 @@ module API requires :url, type: String, desc: "The URL to send the request to" optional :push_events, type: Boolean, desc: "Trigger hook on push events" optional :issues_events, type: Boolean, desc: "Trigger hook on issues events" + optional :confidential_issues_events, type: Boolean, desc: "Trigger hook on confidential issues events" optional :merge_requests_events, type: Boolean, desc: "Trigger hook on merge request events" optional :tag_push_events, type: Boolean, desc: "Trigger hook on tag push events" optional :note_events, type: Boolean, desc: "Trigger hook on note(comment) events" |