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
Léo-Paul Géneau
gitlab-ce
Commits
284185a3
Commit
284185a3
authored
Oct 02, 2017
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add merge_requests_rebase_enabled to json entities for specs
parent
439e3f07
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
spec/fixtures/api/schemas/entities/merge_request.json
spec/fixtures/api/schemas/entities/merge_request.json
+2
-1
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/lib/gitlab/import_export/safe_model_attributes.yml
+1
-0
No files found.
spec/fixtures/api/schemas/entities/merge_request.json
View file @
284185a3
...
@@ -97,7 +97,8 @@
...
@@ -97,7 +97,8 @@
"commits_count"
:
{
"type"
:
"integer"
},
"commits_count"
:
{
"type"
:
"integer"
},
"remove_source_branch"
:
{
"type"
:
[
"boolean"
,
"null"
]
},
"remove_source_branch"
:
{
"type"
:
[
"boolean"
,
"null"
]
},
"merge_ongoing"
:
{
"type"
:
"boolean"
},
"merge_ongoing"
:
{
"type"
:
"boolean"
},
"ff_only_enabled"
:
{
"type"
:
[
"boolean"
,
false
]
}
"ff_only_enabled"
:
{
"type"
:
[
"boolean"
,
false
]
},
"should_be_rebased"
:
{
"type"
:
"boolean"
}
},
},
"additionalProperties"
:
false
"additionalProperties"
:
false
}
}
spec/lib/gitlab/import_export/safe_model_attributes.yml
View file @
284185a3
...
@@ -413,6 +413,7 @@ Project:
...
@@ -413,6 +413,7 @@ Project:
-
ci_config_path
-
ci_config_path
-
delete_error
-
delete_error
-
merge_requests_ff_only_enabled
-
merge_requests_ff_only_enabled
-
merge_requests_rebase_enabled
Author
:
Author
:
-
name
-
name
ProjectFeature
:
ProjectFeature
:
...
...
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