Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
54bc817b
Commit
54bc817b
authored
Dec 13, 2016
by
James Edwards-Jones
Committed by
James Edwards-Jones
Feb 09, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update MergeRequest API state_event option documentation
parent
f93ee986
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
doc/api/merge_requests.md
doc/api/merge_requests.md
+5
-4
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+1
-1
No files found.
doc/api/merge_requests.md
View file @
54bc817b
...
@@ -369,17 +369,18 @@ PUT /projects/:id/merge_requests/:merge_request_id
...
@@ -369,17 +369,18 @@ PUT /projects/:id/merge_requests/:merge_request_id
| --------- | ---- | -------- | ----------- |
| --------- | ---- | -------- | ----------- |
|
`id`
| string | yes | The ID of a project |
|
`id`
| string | yes | The ID of a project |
|
`merge_request_id`
| integer | yes | The ID of a merge request |
|
`merge_request_id`
| integer | yes | The ID of a merge request |
|
`source_branch`
| string | yes | The source branch |
|
`target_branch`
| string | no | The target branch |
|
`target_branch`
| string | yes | The target branch |
|
`title`
| string | no | Title of MR |
|
`title`
| string | yes | Title of MR |
|
`assignee_id`
| integer | no | Assignee user ID |
|
`assignee_id`
| integer | no | Assignee user ID |
|
`description`
| string | no | Description of MR |
|
`description`
| string | no | Description of MR |
|
`
target_project_id`
| integer | no | The target project (numeric id
) |
|
`
state_event`
| string | no | New state (close/reopen
) |
|
`labels`
| string | no | Labels for MR as a comma-separated list |
|
`labels`
| string | no | Labels for MR as a comma-separated list |
|
`milestone_id`
| integer | no | The ID of a milestone |
|
`milestone_id`
| integer | no | The ID of a milestone |
|
`remove_source_branch`
| boolean | no | Flag indicating if a merge request should remove the source branch when merging |
|
`remove_source_branch`
| boolean | no | Flag indicating if a merge request should remove the source branch when merging |
|
`squash`
| boolean| no | Squash commits into a single commit when merging |
|
`squash`
| boolean| no | Squash commits into a single commit when merging |
Must include at least one non-required attribute from above.
```
json
```
json
{
{
"id"
:
1
,
"id"
:
1
,
...
...
lib/api/merge_requests.rb
View file @
54bc817b
...
@@ -140,7 +140,7 @@ module API
...
@@ -140,7 +140,7 @@ module API
params
do
params
do
optional
:title
,
type:
String
,
allow_blank:
false
,
desc:
'The title of the merge request'
optional
:title
,
type:
String
,
allow_blank:
false
,
desc:
'The title of the merge request'
optional
:target_branch
,
type:
String
,
allow_blank:
false
,
desc:
'The target branch'
optional
:target_branch
,
type:
String
,
allow_blank:
false
,
desc:
'The target branch'
optional
:state_event
,
type:
String
,
values:
%w[close reopen
merge
]
,
optional
:state_event
,
type:
String
,
values:
%w[close reopen]
,
desc:
'Status of the merge request'
desc:
'Status of the merge request'
use
:optional_params
use
:optional_params
at_least_one_of
:title
,
:target_branch
,
:description
,
:assignee_id
,
at_least_one_of
:title
,
:target_branch
,
:description
,
:assignee_id
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment