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
33923a49
Commit
33923a49
authored
May 24, 2017
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose remove_source_branch boolean/null
parent
9b479f43
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
app/serializers/merge_request_entity.rb
app/serializers/merge_request_entity.rb
+1
-0
spec/fixtures/api/schemas/entities/merge_request.json
spec/fixtures/api/schemas/entities/merge_request.json
+2
-1
No files found.
app/serializers/merge_request_entity.rb
View file @
33923a49
...
@@ -39,6 +39,7 @@ class MergeRequestEntity < IssuableEntity
...
@@ -39,6 +39,7 @@ class MergeRequestEntity < IssuableEntity
expose
:commits_count
expose
:commits_count
expose
:cannot_be_merged?
,
as: :has_conflicts
expose
:cannot_be_merged?
,
as: :has_conflicts
expose
:can_be_merged?
,
as: :can_be_merged
expose
:can_be_merged?
,
as: :can_be_merged
expose
:remove_source_branch?
,
as: :remove_source_branch
expose
:project_archived
do
|
merge_request
|
expose
:project_archived
do
|
merge_request
|
merge_request
.
project
.
archived?
merge_request
.
project
.
archived?
...
...
spec/fixtures/api/schemas/entities/merge_request.json
View file @
33923a49
...
@@ -92,7 +92,8 @@
...
@@ -92,7 +92,8 @@
"diverged_commits_count"
:
{
"type"
:
"integer"
},
"diverged_commits_count"
:
{
"type"
:
"integer"
},
"commit_change_content_path"
:
{
"type"
:
"string"
},
"commit_change_content_path"
:
{
"type"
:
"string"
},
"remove_wip_path"
:
{
"type"
:
"string"
},
"remove_wip_path"
:
{
"type"
:
"string"
},
"commits_count"
:
{
"type"
:
"integer"
}
"commits_count"
:
{
"type"
:
"integer"
},
"remove_source_branch"
:
{
"type"
:
[
"boolean"
,
"null"
]
}
},
},
"additionalProperties"
:
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