Merge pull request #38 from jubianchi/mr-accept

Add merge method to MR API

Author: m4tthumphrey

lib/Gitlab/Api/MergeRequests.php

@@ -38,6 +38,11 @@ public function update($project_id, $mr_id, array $params)
         return $this->put('projects/'.urlencode($project_id).'/merge_request/'.urlencode($mr_id), $params);
     }
 
+    public function merge($project_id, $mr_id, array $params)
+    {
+        return $this->put('projects/'.urlencode($project_id).'/merge_request/'.urlencode($mr_id).'/merge', $params);
+    }
+
     public function addComment($project_id, $mr_id, $note)
     {
         return $this->post('projects/'.urlencode($project_id).'/merge_request/'.urlencode($mr_id).'/comments', array(

lib/Gitlab/Model/MergeRequest.php

@@ -80,6 +80,13 @@ public function reopen()
         ));
     }
 
+    public function merge($message = null)
+    {
+        $data = $this->api('mr')->merge($this->project->id, $this->id, array('merge_commit_message' => $message));
+
+        return MergeRequest::fromArray($this->getClient(), $this->project, $data);
+    }
+
     public function merged()
     {
         return $this->update(array(