Skip to content

Commit 2c262db

Browse files
authored
Merge pull request #138 from vurtupesz/master
allow to paginate merge request notes
2 parents b41cd8e + f601862 commit 2c262db

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

lib/Gitlab/Api/MergeRequests.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ class MergeRequests extends AbstractApi
1717
* @param int $per_page
1818
* @param string $order_by
1919
* @param string $sort
20+
* @param string $object
2021
* @return mixed
2122
*/
22-
public function getList($project_id, $state = self::STATE_ALL, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = self::SORT)
23+
public function getList($project_id, $state = self::STATE_ALL, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = self::SORT, $object = 'merge_requests')
2324
{
24-
return $this->get($this->getProjectPath($project_id, 'merge_requests'), array(
25+
return $this->get($this->getProjectPath($project_id, $object), array(
2526
'page' => $page,
2627
'per_page' => $per_page,
2728
'state' => $state,
@@ -147,9 +148,9 @@ public function merge($project_id, $mr_id, $message = null)
147148
* @param int $mr_id
148149
* @return mixed
149150
*/
150-
public function showNotes($project_id, $mr_id)
151+
public function showNotes($project_id, $mr_id, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = 'desc')
151152
{
152-
return $this->get($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id).'/notes'));
153+
return $this->getList($project_id, null, $page, $per_page, $order_by, $sort, 'merge_requests/'.$this->encodePath($mr_id).'/notes');
153154
}
154155

155156
/**

0 commit comments

Comments
 (0)