diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-01 12:36:00 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-01 12:36:00 +0200 |
| commit | d8b71ed83e28666286afc4211e0e6ef603fbfe1b (patch) | |
| tree | 9b0267cf378a0d83c37fa51bc8e0196bb12366df /lib/api/entities.rb | |
| parent | 322913f331dddc811760f7d42201974b02aa9f5e (diff) | |
| parent | 41b08e4a08b8caf445d2b7b59e2e76b73ab88a7b (diff) | |
| download | gitlab-ce-d8b71ed83e28666286afc4211e0e6ef603fbfe1b.tar.gz | |
Merge branch 'master' into flevour/gitlab-ce-fix-merge-request-textareas
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 33b6224a810..9620d36ac41 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -45,7 +45,7 @@ module API class ProjectHook < Hook expose :project_id, :push_events - expose :issues_events, :merge_requests_events, :tag_push_events + expose :issues_events, :merge_requests_events, :tag_push_events, :note_events, :enable_ssl_verification end class ForkedFromProject < Grape::Entity |