Skip to content

G
gitlab-ce
Commit 17cc76c9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

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

parents 19c5c445 cbf6b687
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 80 deletions
doc/api/branches.md
View file @ 17cc76c9
...@@ -15,27 +15,20 @@ Parameters: ...@@ -15,27 +15,20 @@ Parameters:
```json ```json
[ [
{ {
"name": "master",
"commit": { "commit": {
"author_email": "john@example.com",
"author_name": "John Smith",
"authored_date": "2012-06-27T05:51:39-07:00",
"committed_date": "2012-06-28T03:44:20-07:00",
"committer_email": "john@example.com",
"committer_name": "John Smith",
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c", "id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c",
"parents": [
{
"id": "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
}
],
"tree": "46e82de44b1061621357f24c05515327f2795a95",
"message": "add projects API", "message": "add projects API",
"author": { "parent_ids": [
"name": "John Smith", "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
"email": "john@example.com" ]
},
"committer": {
"name": "John Smith",
"email": "john@example.com"
},
"authored_date": "2012-06-27T05:51:39-07:00",
"committed_date": "2012-06-28T03:44:20-07:00"
}, },
"name": "master",
"protected": true "protected": true
} }
] ]
...@@ -56,27 +49,20 @@ Parameters: ...@@ -56,27 +49,20 @@ Parameters:
```json ```json
{ {
"name": "master",
"commit": { "commit": {
"author_email": "john@example.com",
"author_name": "John Smith",
"authored_date": "2012-06-27T05:51:39-07:00",
"committed_date": "2012-06-28T03:44:20-07:00",
"committer_email": "john@example.com",
"committer_name": "John Smith",
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c", "id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c",
"parents": [
{
"id": "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
}
],
"tree": "46e82de44b1061621357f24c05515327f2795a95",
"message": "add projects API", "message": "add projects API",
"author": { "parent_ids": [
"name": "John Smith", "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
"email": "john@example.com" ]
},
"committer": {
"name": "John Smith",
"email": "john@example.com"
},
"authored_date": "2012-06-27T05:51:39-07:00",
"committed_date": "2012-06-28T03:44:20-07:00"
}, },
"name": "master",
"protected": true "protected": true
} }
``` ```
...@@ -97,27 +83,20 @@ Parameters: ...@@ -97,27 +83,20 @@ Parameters:
```json ```json
{ {
"name": "master",
"commit": { "commit": {
"author_email": "john@example.com",
"author_name": "John Smith",
"authored_date": "2012-06-27T05:51:39-07:00",
"committed_date": "2012-06-28T03:44:20-07:00",
"committer_email": "john@example.com",
"committer_name": "John Smith",
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c", "id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c",
"parents": [
{
"id": "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
}
],
"tree": "46e82de44b1061621357f24c05515327f2795a95",
"message": "add projects API", "message": "add projects API",
"author": { "parent_ids": [
"name": "John Smith", "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
"email": "john@example.com" ]
},
"committer": {
"name": "John Smith",
"email": "john@example.com"
},
"authored_date": "2012-06-27T05:51:39-07:00",
"committed_date": "2012-06-28T03:44:20-07:00"
}, },
"name": "master",
"protected": true "protected": true
} }
``` ```
...@@ -138,27 +117,20 @@ Parameters: ...@@ -138,27 +117,20 @@ Parameters:
```json ```json
{ {
"name": "master",
"commit": { "commit": {
"author_email": "john@example.com",
"author_name": "John Smith",
"authored_date": "2012-06-27T05:51:39-07:00",
"committed_date": "2012-06-28T03:44:20-07:00",
"committer_email": "john@example.com",
"committer_name": "John Smith",
"id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c", "id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c",
"parents": [
{
"id": "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
}
],
"tree": "46e82de44b1061621357f24c05515327f2795a95",
"message": "add projects API", "message": "add projects API",
"author": { "parent_ids": [
"name": "John Smith", "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
"email": "john@example.com" ]
},
"committer": {
"name": "John Smith",
"email": "john@example.com"
},
"authored_date": "2012-06-27T05:51:39-07:00",
"committed_date": "2012-06-28T03:44:20-07:00"
}, },
"name": "master",
"protected": false "protected": false
} }
``` ```
...@@ -177,21 +149,20 @@ Parameters: ...@@ -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
} }
``` ```
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7