Skip to content

Handle MR description #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2014
Merged

Handle MR description #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/Gitlab/Api/MergeRequests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,19 @@ public function show($project_id, $mr_id)
return $this->get('projects/'.urlencode($project_id).'/merge_request/'.urlencode($mr_id));
}

public function create($project_id, $source, $target, $title, $assignee = null, $target_project_id = null)
public function create($project_id, $source, $target, $title, $assignee = null, $target_project_id = null, $description = null)
{
if ($target_project_id && ! is_numeric($target_project_id)) {
throw new InvalidArgumentException('target_project_id should be numeric, the project name is not allowed');
throw new \InvalidArgumentException('target_project_id should be numeric, the project name is not allowed');
}

return $this->post('projects/'.urlencode($project_id).'/merge_requests', array(
'source_branch' => $source,
'target_branch' => $target,
'title' => $title,
'assignee_id' => $assignee,
'target_project_id' => $target_project_id
'target_project_id' => $target_project_id,
'description' => $description
));
}

Expand Down
14 changes: 7 additions & 7 deletions lib/Gitlab/Model/Project.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,9 @@ public function mergeRequest($id)
return $mr->show();
}

public function createMergeRequest($source, $target, $title, $assignee = null)
public function createMergeRequest($source, $target, $title, $assignee = null, $description = null)
{
$data = $this->api('mr')->create($this->id, $source, $target, $title, $assignee);
$data = $this->api('mr')->create($this->id, $source, $target, $title, $assignee, null, $description);

return MergeRequest::fromArray($this->getClient(), $this, $data);
}
Expand Down Expand Up @@ -494,12 +494,12 @@ public function removeSnippet($id)
return $snippet->remove();
}

public function transfer($group_id)
{
$group = new Group($group_id, $this->getClient());
public function transfer($group_id)
{
$group = new Group($group_id, $this->getClient());

return $group->transfer($this->id);
}
return $group->transfer($this->id);
}

public function forkTo($id)
{
Expand Down