diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-04 13:19:53 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-04 13:37:39 +0200 |
| commit | 882029d9c62c54293147da0d5e2d3b6eaaa89535 (patch) | |
| tree | 69e240b8fa4e65d37854043da211d5e57034ac9c | |
| parent | fff69bdb97d9038976b8a5716238c796487dba50 (diff) | |
| download | gitlab-ce-882029d9c62c54293147da0d5e2d3b6eaaa89535.tar.gz | |
Expose ProjectHook attributes via API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | lib/api/entities.rb | 4 | ||||
| -rw-r--r-- | lib/api/project_hooks.rb | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 90cb69760a9..7daf8ace242 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -24,6 +24,10 @@ module API expose :id, :url, :created_at end + class ProjectHook < Hook + expose :project_id, :push_events, :issues_events, :merge_requests_events + end + class ForkedFromProject < Grape::Entity expose :id expose :name, :name_with_namespace diff --git a/lib/api/project_hooks.rb b/lib/api/project_hooks.rb index 738974955f3..e5da15d3ea9 100644 --- a/lib/api/project_hooks.rb +++ b/lib/api/project_hooks.rb @@ -22,7 +22,7 @@ module API # GET /projects/:id/hooks get ":id/hooks" do @hooks = paginate user_project.hooks - present @hooks, with: Entities::Hook + present @hooks, with: Entities::ProjectHook end # Get a project hook @@ -34,7 +34,7 @@ module API # GET /projects/:id/hooks/:hook_id get ":id/hooks/:hook_id" do @hook = user_project.hooks.find(params[:hook_id]) - present @hook, with: Entities::Hook + present @hook, with: Entities::ProjectHook end @@ -50,7 +50,7 @@ module API @hook = user_project.hooks.new({"url" => params[:url]}) if @hook.save - present @hook, with: Entities::Hook + present @hook, with: Entities::ProjectHook else if @hook.errors[:url].present? error!("Invalid url given", 422) @@ -73,7 +73,7 @@ module API attrs = attributes_for_keys [:url] if @hook.update_attributes attrs - present @hook, with: Entities::Hook + present @hook, with: Entities::ProjectHook else if @hook.errors[:url].present? error!("Invalid url given", 422) |