Merge pull request #125 from phpcodecrafting/master

Adding the newer merge request notes API endpoint.

Author: m4tthumphrey

lib/Gitlab/Api/MergeRequests.php

@@ -142,6 +142,16 @@ public function merge($project_id, $mr_id, $message = null)
         return $this->put($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/merge'), $params);
     }
 
+    /**
+     * @param int $project_id
+     * @param int $mr_id
+     * @return mixed
+     */
+    public function showNotes($project_id, $mr_id)
+    {
+        return $this->get($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id).'/notes'));
+    }
+
     /**
      * @param int $project_id
      * @param int $mr_id

test/Gitlab/Tests/Api/MergeRequestsTest.php

@@ -262,6 +262,26 @@ public function shouldMergeMergeRequest()
         $this->assertEquals($expectedArray, $api->merge(1, 2, array('merge_commit_message' => 'Accepted')));
     }
 
+    /**
+     * @test
+     */
+    public function shouldGetMergeRequestNotes()
+    {
+        $expectedArray = array(
+            array('id' => 1, 'body' => 'A comment'),
+            array('id' => 2, 'body' => 'Another comment')
+        );
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('get')
+            ->with('projects/1/merge_requests/2/notes')
+            ->will($this->returnValue($expectedArray))
+        ;
+
+        $this->assertEquals($expectedArray, $api->showNotes(1, 2));
+    }
+
     /**
      * @test
      */