From 37058043bd0aa0e6c34cfe6ff05f50e2dd8c2908 Mon Sep 17 00:00:00 2001
From: Tyler Sommer <sommertm@gmail.com>
Date: Mon, 26 May 2014 07:50:30 -0700
Subject: [PATCH] Added ability to specify activation types when creating or
 updating project hooks

---
 lib/Gitlab/Api/Projects.php  | 27 ++++++++++++++++++++++-----
 lib/Gitlab/Model/Project.php |  8 ++++----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/lib/Gitlab/Api/Projects.php b/lib/Gitlab/Api/Projects.php
index 40409f58b..6c600e9b6 100644
--- a/lib/Gitlab/Api/Projects.php
+++ b/lib/Gitlab/Api/Projects.php
@@ -96,18 +96,35 @@ public function hook($project_id, $hook_id)
         return $this->get('projects/'.urlencode($project_id).'/hooks/'.urlencode($hook_id));
     }
 
-    public function addHook($project_id, $url)
+    public function addHook($project_id, $url, $push_events = true, $issues_events = false, $merge_requests_events = false)
     {
         return $this->post('projects/'.urlencode($project_id).'/hooks', array(
-            'url' => $url
+            'url' => $url,
+            'push_events' => $push_events,
+            'issues_events' => $issues_events,
+            'merge_requests_events' => $merge_requests_events
         ));
     }
 
-    public function updateHook($project_id, $hook_id, $url)
+    public function updateHook($project_id, $hook_id, $url, $push_events = null, $issues_events = null, $merge_requests_events = null)
     {
-        return $this->put('projects/'.urlencode($project_id).'/hooks/'.urlencode($hook_id), array(
+        $params = array(
             'url' => $url
-        ));
+        );
+        
+        if (null !== $push_events) {
+            $params['push_events'] = $push_events;
+        }
+
+        if (null !== $issues_events) {
+            $params['issues_events'] = $issues_events;
+        }
+
+        if (null !== $merge_requests_events) {
+            $params['merge_requests_events'] = $merge_requests_events;
+        }
+        
+        return $this->put('projects/'.urlencode($project_id).'/hooks/'.urlencode($hook_id), $params);
     }
 
     public function removeHook($project_id, $hook_id)
diff --git a/lib/Gitlab/Model/Project.php b/lib/Gitlab/Model/Project.php
index db517aaf3..906b75a56 100644
--- a/lib/Gitlab/Model/Project.php
+++ b/lib/Gitlab/Model/Project.php
@@ -135,16 +135,16 @@ public function hook($hook_id)
         return Hook::fromArray($this->getClient(), $data);
     }
 
-    public function addHook($url)
+    public function addHook($url, $push_events = true, $issues_events = false, $merge_requests_events = false)
     {
-        $data = $this->api('projects')->addHook($this->id, $url);
+        $data = $this->api('projects')->addHook($this->id, $url, $push_events, $issues_events, $merge_requests_events);
 
         return Hook::fromArray($this->getClient(), $data);
     }
 
-    public function updateHook($hook_id, $url)
+    public function updateHook($hook_id, $url, $push_events = null, $issues_events = null, $merge_requests_events = null)
     {
-        $data = $this->api('projects')->updateHook($this->id, $hook_id, $url);
+        $data = $this->api('projects')->updateHook($this->id, $hook_id, $url, $push_events, $issues_events, $merge_requests_events);
 
         return Hook::fromArray($this->getClient(), $data);
     }