Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-30 20:40:39 +0300
committerRémy Coutable <remy@rymai.me>2016-11-30 20:40:39 +0300
commit467b44cbbfd70c627dca0a8f57966bc5ba0999c3 (patch)
tree9a7bbf3078d6e9661df7f1a20706a489b0af9920 /doc
parentd48787a23370056770b634785a4185ed2a4fbadd (diff)
parent2ce66c071fc7ab2b8ca881223321a3927ec7d61e (diff)
Merge branch 'api-branch-status' into 'master'
API: Expose branch status Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24938 See merge request !7796
Diffstat (limited to 'doc')
-rw-r--r--doc/api/branches.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/api/branches.md b/doc/api/branches.md
index 07dfa5d4d7f..ffcfea41453 100644
--- a/doc/api/branches.md
+++ b/doc/api/branches.md
@@ -22,6 +22,7 @@ Example response:
[
{
"name": "master",
+ "merged": false,
"protected": true,
"developers_can_push": false,
"developers_can_merge": false,
@@ -65,6 +66,7 @@ Example response:
```json
{
"name": "master",
+ "merged": false,
"protected": true,
"developers_can_push": false,
"developers_can_merge": false,
@@ -123,6 +125,7 @@ Example response:
]
},
"name": "master",
+ "merged": false,
"protected": true,
"developers_can_push": true,
"developers_can_merge": true
@@ -166,6 +169,7 @@ Example response:
]
},
"name": "master",
+ "merged": false,
"protected": false,
"developers_can_push": false,
"developers_can_merge": false
@@ -206,6 +210,7 @@ Example response:
]
},
"name": "newbranch",
+ "merged": false,
"protected": false,
"developers_can_push": false,
"developers_can_merge": false