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
07499a99
Commit
07499a99
authored
Feb 23, 2022
by
Raimund Hook
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated wording in doc/api/merge_requests.md response notes
Signed-off-by:
Raimund Hook
<
raimund.hook@exfo.com
>
parent
5a000354
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
doc/api/merge_requests.md
doc/api/merge_requests.md
+2
-2
No files found.
doc/api/merge_requests.md
View file @
07499a99
...
...
@@ -775,8 +775,8 @@ the `approvals_before_merge` parameter:
### Single merge request response notes
-
The
`merge_status`
field may hold one of the following values:
-
`unchecked`
:
We have not checked this yet
.
-
`checking`
:
We are currently checking if the merge reques
t can be merged.
-
`unchecked`
:
This merge request has not yet been checked
.
-
`checking`
:
This merge request is currently being checked to see if i
t can be merged.
-
`can_be_merged`
: This merge request can be merged without conflict.
-
`cannot_be_merged`
: There are merge conflicts between the source and target branches.
-
`cannot_be_merged_recheck`
: Currently unchecked. Before the current changes, there were conflicts.
...
...
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