Merge branch 'feature/#32877-add-default-field-branch-api' into 'master'

Add default parameter to branches API

Closes #32877

See merge request gitlab-org/gitlab-ce!21294
This commit is contained in:
Robert Speicher 2018-09-01 00:39:43 +00:00
commit 21b7e203b3
4 changed files with 16 additions and 0 deletions

View File

@ -0,0 +1,5 @@
---
title: Add default parameter to branches API
merge_request: 21294
author: Riccardo Padovani
type: changed

View File

@ -27,6 +27,7 @@ Example response:
"name": "master",
"merged": false,
"protected": true,
"default": true,
"developers_can_push": false,
"developers_can_merge": false,
"can_push": true,
@ -75,6 +76,7 @@ Example response:
"name": "master",
"merged": false,
"protected": true,
"default": true,
"developers_can_push": false,
"developers_can_merge": false,
"can_push": true,
@ -141,6 +143,7 @@ Example response:
"name": "master",
"merged": false,
"protected": true,
"default": true,
"developers_can_push": true,
"developers_can_merge": true,
"can_push": true
@ -190,6 +193,7 @@ Example response:
"name": "master",
"merged": false,
"protected": false,
"default": true,
"developers_can_push": false,
"developers_can_merge": false,
"can_push": true
@ -234,6 +238,7 @@ Example response:
"name": "newbranch",
"merged": false,
"protected": false,
"default": false,
"developers_can_push": false,
"developers_can_merge": false,
"can_push": true

View File

@ -370,6 +370,10 @@ module API
expose :can_push do |repo_branch, options|
Gitlab::UserAccess.new(options[:current_user], project: options[:project]).can_push_to_branch?(repo_branch.name)
end
expose :default do |repo_branch, options|
options[:project].default_branch == repo_branch.name
end
end
class TreeObject < Grape::Entity

View File

@ -5,6 +5,7 @@
"commit",
"merged",
"protected",
"default",
"developers_can_push",
"developers_can_merge"
],
@ -13,6 +14,7 @@
"commit": { "$ref": "commit/basic.json" },
"merged": { "type": "boolean" },
"protected": { "type": "boolean" },
"default": { "type": "boolean" },
"developers_can_push": { "type": "boolean" },
"developers_can_merge": { "type": "boolean" },
"can_push": { "type": "boolean" }