kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2015-02-19 09:58:06 -08:00
commit 17cc76c9a9
1 changed files with 55 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
doc/api/branches.md
View file

@ -15,27 +15,20 @@ Parameters:
```json ```json
[ [
{ {
"name": "master",
"commit": { "commit": {
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c", "author_email": "john@example.com",
"parents": [ "author_name": "John Smith",
{
"id": "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
}
],
"tree": "46e82de44b1061621357f24c05515327f2795a95",
"message": "add projects API",
"author": {
"name": "John Smith",
"email": "john@example.com"
},
"committer": {
"name": "John Smith",
"email": "john@example.com"
},
"authored_date": "2012-06-27T05:51:39-07:00", "authored_date": "2012-06-27T05:51:39-07:00",
"committed_date": "2012-06-28T03:44:20-07:00" "committed_date": "2012-06-28T03:44:20-07:00",
"committer_email": "john@example.com",
"committer_name": "John Smith",
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c",
"message": "add projects API",
"parent_ids": [
"4ad91d3c1144c406e50c7b33bae684bd6837faf8"
]
}, },
"name": "master",
"protected": true "protected": true
} }
] ]
@ -56,27 +49,20 @@ Parameters:
```json ```json
{ {
"name": "master",
"commit": { "commit": {
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c", "author_email": "john@example.com",
"parents": [ "author_name": "John Smith",
{
"id": "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
}
],
"tree": "46e82de44b1061621357f24c05515327f2795a95",
"message": "add projects API",
"author": {
"name": "John Smith",
"email": "john@example.com"
},
"committer": {
"name": "John Smith",
"email": "john@example.com"
},
"authored_date": "2012-06-27T05:51:39-07:00", "authored_date": "2012-06-27T05:51:39-07:00",
"committed_date": "2012-06-28T03:44:20-07:00" "committed_date": "2012-06-28T03:44:20-07:00",
"committer_email": "john@example.com",
"committer_name": "John Smith",
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c",
"message": "add projects API",
"parent_ids": [
"4ad91d3c1144c406e50c7b33bae684bd6837faf8"
]
}, },
"name": "master",
"protected": true "protected": true
} }
``` ```
@ -97,27 +83,20 @@ Parameters:
```json ```json
{ {
"name": "master",
"commit": { "commit": {
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c", "author_email": "john@example.com",
"parents": [ "author_name": "John Smith",
{
"id": "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
}
],
"tree": "46e82de44b1061621357f24c05515327f2795a95",
"message": "add projects API",
"author": {
"name": "John Smith",
"email": "john@example.com"
},
"committer": {
"name": "John Smith",
"email": "john@example.com"
},
"authored_date": "2012-06-27T05:51:39-07:00", "authored_date": "2012-06-27T05:51:39-07:00",
"committed_date": "2012-06-28T03:44:20-07:00" "committed_date": "2012-06-28T03:44:20-07:00",
"committer_email": "john@example.com",
"committer_name": "John Smith",
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c",
"message": "add projects API",
"parent_ids": [
"4ad91d3c1144c406e50c7b33bae684bd6837faf8"
]
}, },
"name": "master",
"protected": true "protected": true
} }
``` ```
@ -138,27 +117,20 @@ Parameters:
```json ```json
{ {
"name": "master",
"commit": { "commit": {
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c", "author_email": "john@example.com",
"parents": [ "author_name": "John Smith",
{
"id": "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
}
],
"tree": "46e82de44b1061621357f24c05515327f2795a95",
"message": "add projects API",
"author": {
"name": "John Smith",
"email": "john@example.com"
},
"committer": {
"name": "John Smith",
"email": "john@example.com"
},
"authored_date": "2012-06-27T05:51:39-07:00", "authored_date": "2012-06-27T05:51:39-07:00",
"committed_date": "2012-06-28T03:44:20-07:00" "committed_date": "2012-06-28T03:44:20-07:00",
"committer_email": "john@example.com",
"committer_name": "John Smith",
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c",
"message": "add projects API",
"parent_ids": [
"4ad91d3c1144c406e50c7b33bae684bd6837faf8"
]
}, },
"name": "master",
"protected": false "protected": false
} }
``` ```
@ -177,21 +149,20 @@ Parameters:
```json ```json
{ {
"name": "my-new-branch",
"commit": { "commit": {
"id": "8848c0e90327a0b70f1865b843fb2fbfb9345e57",
"message": "Merge pull request #54 from brightbox/use_fog_brightbox_module\n\nUpdate to use fog-brightbox module",
"parent_ids": [
"fff449e0bf453576f16c91d6544f00a2664009d8",
"f93a93626fec20fd659f4ed3ab2e64019b6169ae"
],
"authored_date": "2014-02-20T19:54:55+02:00",
"author_name": "john smith",
"author_email": "john@example.com", "author_email": "john@example.com",
"committed_date": "2014-02-20T19:54:55+02:00", "author_name": "John Smith",
"committer_name": "john smith", "authored_date": "2012-06-27T05:51:39-07:00",
"committer_email": "john@example.com" "committed_date": "2012-06-28T03:44:20-07:00",
"committer_email": "john@example.com",
"committer_name": "John Smith",
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c",
"message": "add projects API",
"parent_ids": [
"4ad91d3c1144c406e50c7b33bae684bd6837faf8"
]
}, },
"name": "master",
"protected": false "protected": false
} }
``` ```