diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-18 14:37:16 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-01-18 14:37:16 +0300 |
| commit | 8e9c073a146f655cea2fd13f259bd68dc2c37259 (patch) | |
| tree | 01bd2ec14fd6406b1deb1947935b36463a7e4529 /lib/api/entities.rb | |
| parent | d617c24f59f9cc1c068301ec755caa2de6cd6b73 (diff) | |
| parent | 6ef1b94ccf9eb60d5cff43d7e1302129d1b43cc3 (diff) | |
Merge branch 'feature/merge-request-system-hook' into 'master'
System hooks for Merge Requests
See merge request gitlab-org/gitlab-ce!14387
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 971cb83a2d9..3f4b62dc1b2 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -65,12 +65,12 @@ module API end class Hook < Grape::Entity - expose :id, :url, :created_at, :push_events, :tag_push_events, :repository_update_events + expose :id, :url, :created_at, :push_events, :tag_push_events, :merge_requests_events, :repository_update_events expose :enable_ssl_verification end class ProjectHook < Hook - expose :project_id, :issues_events, :merge_requests_events + expose :project_id, :issues_events expose :note_events, :pipeline_events, :wiki_page_events expose :job_events end |