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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
5fd3ec1c
Commit
5fd3ec1c
authored
Sep 20, 2017
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix entities/merge_request.json by adding ff_only_merge
parent
19a62632
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
spec/fixtures/api/schemas/entities/merge_request.json
spec/fixtures/api/schemas/entities/merge_request.json
+2
-1
No files found.
spec/fixtures/api/schemas/entities/merge_request.json
View file @
5fd3ec1c
...
...
@@ -96,7 +96,8 @@
"remove_wip_path"
:
{
"type"
:
"string"
},
"commits_count"
:
{
"type"
:
"integer"
},
"remove_source_branch"
:
{
"type"
:
[
"boolean"
,
"null"
]
},
"merge_ongoing"
:
{
"type"
:
"boolean"
}
"merge_ongoing"
:
{
"type"
:
"boolean"
},
"ff_only_enabled"
:
{
"type"
:
[
"boolean"
,
false
]
}
},
"additionalProperties"
:
false
}
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