Merge pull request #47 from davidkuridza/bug/fix-wrong-MR-comments-endpoint

jubianchi · jubianchi · commit 4168b2d297c8 · 2014-07-22T12:19:41.000+02:00
fix wrong comments endpoint for merge requests
diff --git a/lib/Gitlab/Api/MergeRequests.php b/lib/Gitlab/Api/MergeRequests.php
@@ -43,9 +43,9 @@ 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 showComments($project_id, $issue_id)
+    public function showComments($project_id, $mr_id)
     {
-        return $this->get('projects/'.urlencode($project_id).'/issues/'.urlencode($issue_id).'/notes');
+        return $this->get('projects/'.urlencode($project_id).'/merge_request/'.urlencode($mr_id).'/comments');
     }
 
     public function addComment($project_id, $mr_id, $note)

Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ public function merge($project_id, $mr_id, array $params)`
`43`	`43`	`return $this->put('projects/'.urlencode($project_id).'/merge_request/'.urlencode($mr_id).'/merge', $params);`
`44`	`44`	`}`
`45`	`45`
`46`		`- public function showComments($project_id, $issue_id)`
	`46`	`+ public function showComments($project_id, $mr_id)`
`47`	`47`	`{`
`48`		`- return $this->get('projects/'.urlencode($project_id).'/issues/'.urlencode($issue_id).'/notes');`
	`48`	`+ return $this->get('projects/'.urlencode($project_id).'/merge_request/'.urlencode($mr_id).'/comments');`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public function addComment($project_id, $mr_id, $note)`