Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ci

2 files changed, 28 insertions, 0 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 0748442..dfd419a 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -23,5 +23,9 @@ module API
     class RunnerProject < Grape::Entity
       expose :id, :project_id, :runner_id
     end
+
+    class WebHook < Grape::Entity
+      expose :id, :project_id, :url
+    end
   end
 end
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 89faa04..632aa51 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -4,6 +4,30 @@ module API
     before { authenticate! }
 
     resource :projects do
+      # Register new webhook for project
+      #
+      # Parameters
+      #   project_id (required) - The ID of a project
+      #   web_hook (required) - WebHook URL
+      # Example Request
+      #   POST /projects/:project_id/webhooks
+      post ":project_id/webhooks" do
+        required_attributes! [:web_hook]
+
+        project = Project.find(params[:project_id])
+
+        if project.present? && current_user.can_access_project?(project.gitlab_id)
+          web_hook = project.web_hooks.new({url: params[:web_hook]})
+
+          if web_hook.save
+            present web_hook, :with => Entities::WebHook
+          else
+            errors = web_hook.errors.full_messages.join(", ")
+            render_api_error!(errors, 400)
+          end
+        end
+      end
+
       # Retrieve all Gitlab CI projects that the user has access to
       #
       # Example Request: