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
Jérome Perrin
gitlab-ce
Commits
3740597f
Commit
3740597f
authored
Apr 06, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
parents
7ced2eb4
26ab17a8
Changes
13
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
355 additions
and
354 deletions
+355
-354
doc/api/branches.md
doc/api/branches.md
+16
-13
doc/api/commits.md
doc/api/commits.md
+3
-3
doc/api/deploy_keys.md
doc/api/deploy_keys.md
+9
-15
doc/api/issues.md
doc/api/issues.md
+1
-1
doc/api/merge_requests.md
doc/api/merge_requests.md
+129
-130
doc/api/milestones.md
doc/api/milestones.md
+9
-9
doc/api/notes.md
doc/api/notes.md
+47
-47
doc/api/projects.md
doc/api/projects.md
+79
-71
doc/api/repositories.md
doc/api/repositories.md
+39
-36
doc/api/repository_files.md
doc/api/repository_files.md
+3
-3
doc/api/session.md
doc/api/session.md
+3
-3
doc/api/system_hooks.md
doc/api/system_hooks.md
+9
-9
doc/api/users.md
doc/api/users.md
+8
-14
No files found.
doc/api/branches.md
View file @
3740597f
...
...
@@ -185,7 +185,10 @@ Parameters:
"commit"
:
{
"id"
:
"8848c0e90327a0b70f1865b843fb2fbfb9345e57"
,
"message"
:
"Merge pull request #54 from brightbox/use_fog_brightbox_module
\n\n
Update to use fog-brightbox module"
,
"parent_ids"
:
[
"fff449e0bf453576f16c91d6544f00a2664009d8"
,
"f93a93626fec20fd659f4ed3ab2e64019b6169ae"
],
"parent_ids"
:
[
"fff449e0bf453576f16c91d6544f00a2664009d8"
,
"f93a93626fec20fd659f4ed3ab2e64019b6169ae"
],
"authored_date"
:
"2014-02-20T19:54:55+02:00"
,
"author_name"
:
"john smith"
,
"author_email"
:
"john@example.com"
,
...
...
doc/api/commits.md
View file @
3740597f
...
...
@@ -57,7 +57,7 @@ Parameters:
"created_at"
:
"2012-09-20T09:06:12+03:00"
,
"committed_date"
:
"2012-09-20T09:06:12+03:00"
,
"authored_date"
:
"2012-09-20T09:06:12+03:00"
,
"parent_ids"
:
[
"parent_ids"
:
[
"ae1d9fb46aa2b07ee9836d49862ec4e2c46fbbba"
]
}
...
...
doc/api/deploy_keys.md
View file @
3740597f
...
...
@@ -16,19 +16,15 @@ Parameters:
[
{
"id"
:
1
,
"title"
:
"Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
"created_at"
:
"2013-10-02T10:12:29Z"
"title"
:
"Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
"created_at"
:
"2013-10-02T10:12:29Z"
},
{
"id"
:
3
,
"title"
:
"Another Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
"created_at"
:
"2013-10-02T11:12:29Z"
"title"
:
"Another Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
"created_at"
:
"2013-10-02T11:12:29Z"
}
]
```
...
...
@@ -50,11 +46,9 @@ Parameters:
```
json
{
"id"
:
1
,
"title"
:
"Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
"created_at"
:
"2013-10-02T10:12:29Z"
"title"
:
"Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
"created_at"
:
"2013-10-02T10:12:29Z"
}
```
...
...
doc/api/issues.md
View file @
3740597f
...
...
@@ -15,7 +15,7 @@ GET /issues
"project_id"
:
8
,
"title"
:
"4xx/5xx pages"
,
"description"
:
""
,
"labels"
:
[
],
"labels"
:
[],
"milestone"
:
null
,
"assignee"
:
null
,
"author"
:
{
...
...
doc/api/merge_requests.md
View file @
3740597f
...
...
@@ -14,30 +14,30 @@ Parameters:
```
json
[
{
"id"
:
1
,
"iid"
:
1
,
"target_branch"
:
"master"
,
"source_branch"
:
"test1"
,
"project_id"
:
3
,
"title"
:
"test1"
,
"state"
:
"opened"
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"author"
:
{
"id"
:
1
,
"id"
:
1
,
"iid"
:
1
,
"target_branch"
:
"master"
,
"source_branch"
:
"test1"
,
"project_id"
:
3
,
"title"
:
"test1"
,
"state"
:
"opened"
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
},
"assignee"
:
{
"id"
:
1
,
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
}
}
]
...
...
@@ -59,30 +59,30 @@ Parameters:
```
json
{
"id"
:
1
,
"iid"
:
1
,
"target_branch"
:
"master"
,
"source_branch"
:
"test1"
,
"project_id"
:
3
,
"title"
:
"test1"
,
"state"
:
"merged"
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"author"
:
{
"id"
:
1
,
"id"
:
1
,
"iid"
:
1
,
"target_branch"
:
"master"
,
"source_branch"
:
"test1"
,
"project_id"
:
3
,
"title"
:
"test1"
,
"state"
:
"merged"
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
},
"assignee"
:
{
"id"
:
1
,
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
}
}
```
...
...
@@ -106,29 +106,29 @@ Parameters:
```
json
{
"id"
:
1
,
"target_branch"
:
"master"
,
"source_branch"
:
"test1"
,
"project_id"
:
3
,
"title"
:
"test1"
,
"state"
:
"opened"
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"author"
:
{
"id"
:
1
,
"id"
:
1
,
"target_branch"
:
"master"
,
"source_branch"
:
"test1"
,
"project_id"
:
3
,
"title"
:
"test1"
,
"state"
:
"opened"
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
},
"assignee"
:
{
"id"
:
1
,
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
}
}
```
...
...
@@ -153,31 +153,30 @@ Parameters:
+
`state_event`
- New state (close|reopen|merge)
```
json
{
"id"
:
1
,
"target_branch"
:
"master"
,
"source_branch"
:
"test1"
,
"project_id"
:
3
,
"title"
:
"test1"
,
"state"
:
"opened"
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"author"
:
{
"id"
:
1
,
"id"
:
1
,
"target_branch"
:
"master"
,
"source_branch"
:
"test1"
,
"project_id"
:
3
,
"title"
:
"test1"
,
"state"
:
"opened"
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
},
"assignee"
:
{
"id"
:
1
,
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
}
}
```
...
...
@@ -200,15 +199,15 @@ Parameters:
```
json
{
"author"
:
{
"id"
:
1
,
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"blocked"
:
false
,
"created_at"
:
"2012-04-29T08:46:00Z"
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"blocked"
:
false
,
"created_at"
:
"2012-04-29T08:46:00Z"
},
"note"
:
"text1"
"note"
:
"text1"
}
```
...
...
@@ -229,25 +228,25 @@ Parameters:
```
json
[
{
"note"
:
"this is the 1st comment on the 2merge merge request"
,
"author"
:
{
"id"
:
11
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2014-03-06T08:17:35.000Z"
"note"
:
"this is the 1st comment on the 2merge merge request"
,
"author"
:
{
"id"
:
11
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2014-03-06T08:17:35.000Z"
}
},
{
"note"
:
"_Status changed to closed_"
,
"author"
:
{
"id"
:
11
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2014-03-06T08:17:35.000Z"
"note"
:
"_Status changed to closed_"
,
"author"
:
{
"id"
:
11
,
"username"
:
"admin"
,
"email"
:
"admin@local.host"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2014-03-06T08:17:35.000Z"
}
}
]
...
...
doc/api/milestones.md
View file @
3740597f
...
...
@@ -9,15 +9,15 @@ GET /projects/:id/milestones
```
json
[
{
"id"
:
12
,
"iid"
:
3
,
"project_id"
:
16
,
"title"
:
"10.0"
,
"description"
:
"Version"
,
"due_date"
:
"2013-11-29"
,
"state"
:
"active"
,
"updated_at"
:
"2013-10-02T09:24:18Z"
,
"created_at"
:
"2013-10-02T09:24:18Z"
"id"
:
12
,
"iid"
:
3
,
"project_id"
:
16
,
"title"
:
"10.0"
,
"description"
:
"Version"
,
"due_date"
:
"2013-11-29"
,
"state"
:
"active"
,
"updated_at"
:
"2013-10-02T09:24:18Z"
,
"created_at"
:
"2013-10-02T09:24:18Z"
}
]
```
...
...
doc/api/notes.md
View file @
3740597f
...
...
@@ -17,7 +17,7 @@ Parameters:
{
"id"
:
522
,
"body"
:
"The solution is rather tricky"
,
"attachment"
:
null
,
"attachment"
:
null
,
"author"
:
{
"id"
:
1
,
"username"
:
"john_smith"
,
...
...
@@ -77,32 +77,32 @@ Parameters:
```
json
[
{
"id"
:
302
,
"body"
:
"_Status changed to closed_"
,
"attachment"
:
null
,
"author"
:{
"id"
:
1
,
"username"
:
"pipin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Pip"
,
"state"
:
"active"
,
"created_at"
:
"2013-09-30T13:46:01Z"
"id"
:
302
,
"body"
:
"_Status changed to closed_"
,
"attachment"
:
null
,
"author"
:
{
"id"
:
1
,
"username"
:
"pipin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Pip"
,
"state"
:
"active"
,
"created_at"
:
"2013-09-30T13:46:01Z"
},
"created_at"
:
"2013-10-02T09:22:45Z"
"created_at"
:
"2013-10-02T09:22:45Z"
},
{
"id"
:
305
,
"body"
:
"Text of the comment
\r\n
"
,
"attachment"
:
null
,
"author"
:{
"id"
:
1
,
"username"
:
"pipin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Pip"
,
"state"
:
"active"
,
"created_at"
:
"2013-09-30T13:46:01Z"
"id"
:
305
,
"body"
:
"Text of the comment
\r\n
"
,
"attachment"
:
null
,
"author"
:
{
"id"
:
1
,
"username"
:
"pipin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Pip"
,
"state"
:
"active"
,
"created_at"
:
"2013-09-30T13:46:01Z"
},
"created_at"
:
"2013-10-02T09:56:03Z"
"created_at"
:
"2013-10-02T09:56:03Z"
}
]
```
...
...
@@ -169,20 +169,20 @@ Parameters:
```
json
{
"id"
:
52
,
"title"
:
"Snippet"
,
"file_name"
:
"snippet.rb"
,
"author"
:{
"id"
:
1
,
"username"
:
"pipin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Pip"
,
"state"
:
"active"
,
"created_at"
:
"2013-09-30T13:46:01Z"
"id"
:
52
,
"title"
:
"Snippet"
,
"file_name"
:
"snippet.rb"
,
"author"
:
{
"id"
:
1
,
"username"
:
"pipin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Pip"
,
"state"
:
"active"
,
"created_at"
:
"2013-09-30T13:46:01Z"
},
"expires_at"
:
null
,
"updated_at"
:
"2013-10-02T07:34:20Z"
,
"created_at"
:
"2013-10-02T07:34:20Z"
"expires_at"
:
null
,
"updated_at"
:
"2013-10-02T07:34:20Z"
,
"created_at"
:
"2013-10-02T07:34:20Z"
}
```
...
...
@@ -233,18 +233,18 @@ Parameters:
```
json
{
"id"
:
301
,
"body"
:
"Comment for MR"
,
"attachment"
:
null
,
"author"
:{
"id"
:
1
,
"username"
:
"pipin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Pip"
,
"state"
:
"active"
,
"created_at"
:
"2013-09-30T13:46:01Z"
"id"
:
301
,
"body"
:
"Comment for MR"
,
"attachment"
:
null
,
"author"
:
{
"id"
:
1
,
"username"
:
"pipin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Pip"
,
"state"
:
"active"
,
"created_at"
:
"2013-09-30T13:46:01Z"
},
"created_at"
:
"2013-10-02T08:57:14Z"
"created_at"
:
"2013-10-02T08:57:14Z"
}
```
...
...
doc/api/projects.md
View file @
3740597f
...
...
@@ -147,7 +147,7 @@ Parameters:
"owner_id"
:
1
,
"path"
:
"diaspora"
,
"updated_at"
:
"2013-09-30T13: 46: 02Z"
}
}
,
"permissions"
:
{
"project_access"
:
{
"access_level"
:
10
,
...
...
@@ -175,8 +175,8 @@ Parameters:
+
`id`
(required) - The ID or NAMESPACE/PROJECT_NAME of a project
```
json
[
{
[
{
"title"
:
null
,
"project_id"
:
15
,
"action_name"
:
"closed"
,
...
...
@@ -185,7 +185,8 @@ Parameters:
"author_id"
:
1
,
"data"
:
null
,
"target_title"
:
"Public project search field"
},
{
},
{
"title"
:
null
,
"project_id"
:
15
,
"action_name"
:
"opened"
,
...
...
@@ -204,7 +205,8 @@ Parameters:
"description"
:
"GitLab: self hosted Git management software.
\r\n
Distributed under the MIT License."
,
"homepage"
:
"https://dev.gitlab.org/gitlab/gitlabhq"
},
"commits"
:
[{
"commits"
:
[
{
"id"
:
"c5feabde2d8cd023215af4d2ceeb7a64839fc428"
,
"message"
:
"Add simple search to projects in public area"
,
"timestamp"
:
"2013-05-13T18:18:08+00:00"
,
...
...
@@ -213,11 +215,13 @@ Parameters:
"name"
:
"Dmitriy Zaporozhets"
,
"email"
:
"dmitriy.zaporozhets@gmail.com"
}
}],
}
],
"total_commits_count"
:
1
},
"target_title"
:
null
},
{
},
{
"title"
:
null
,
"project_id"
:
15
,
"action_name"
:
"closed"
,
...
...
@@ -226,7 +230,8 @@ Parameters:
"author_id"
:
1
,
"data"
:
null
,
"target_title"
:
"Finish & merge Code search PR"
}]
}
]
```
...
...
@@ -493,34 +498,38 @@ Parameters:
```
json
[
{
"name"
:
"async"
,
"name"
:
"async"
,
"commit"
:
{
"id"
:
"a2b702edecdf41f07b42653eb1abe30ce98b9fca"
,
"parents"
:
[{
"id"
:
"3f94fc7c85061973edc9906ae170cc269b07ca55"
}],
"id"
:
"a2b702edecdf41f07b42653eb1abe30ce98b9fca"
,
"parents"
:
[
{
"id"
:
"3f94fc7c85061973edc9906ae170cc269b07ca55"
}
],
"tree"
:
"c68537c6534a02cc2b176ca1549f4ffa190b58ee"
,
"message"
:
"give caolan credit where it's due (up top)"
,
"message"
:
"give caolan credit where it's due (up top)"
,
"author"
:
{
"name"
:
"Jeremy Ashkenas"
,
"email"
:
"jashkenas@example.com"
"name"
:
"Jeremy Ashkenas"
,
"email"
:
"jashkenas@example.com"
},
"committer"
:
{
"name"
:
"Jeremy Ashkenas"
,
"email"
:
"jashkenas@example.com"
"name"
:
"Jeremy Ashkenas"
,
"email"
:
"jashkenas@example.com"
},
"authored_date"
:
"2010-12-08T21:28:50+00:00"
,
"committed_date"
:
"2010-12-08T21:28:50+00:00"
"authored_date"
:
"2010-12-08T21:28:50+00:00"
,
"committed_date"
:
"2010-12-08T21:28:50+00:00"
},
"protected"
:
false
"protected"
:
false
},
{
"name"
:
"gh-pages"
,
"commit"
:
{
"id"
:
"101c10a60019fe870d21868835f65c25d64968fc"
,
"parents"
:
[{
"parents"
:
[
{
"id"
:
"9c15d2e26945a665131af5d7b6d30a06ba338aaa"
}],
}
],
"tree"
:
"fb5cc9d45da3014b17a876ad539976a0fb9b352a"
,
"message"
:
"Underscore.js 1.5.2"
,
"author"
:
{
...
...
@@ -537,7 +546,6 @@ Parameters:
"protected"
:
false
}
]
```
### List single branch
...
...
@@ -640,7 +648,7 @@ Parameters:
```
json
[
{
"name"
:
"featut
e"
"name"
:
"featur
e"
},
{
"name"
:
"bug"
...
...
doc/api/repositories.md
View file @
3740597f
...
...
@@ -16,9 +16,7 @@ Parameters:
"name"
:
"v1.0.0"
,
"commit"
:
{
"id"
:
"2695effb5807a22ff3d138d593fd856244e155e7"
,
"parents"
:
[
],
"parents"
:
[],
"tree"
:
"38017f2f189336fe4497e9d230c5bb1bf873f08d"
,
"message"
:
"Initial commit"
,
"author"
:
{
...
...
@@ -52,39 +50,44 @@ Parameters:
+
`ref_name`
(optional) - The name of a repository branch or tag or if not given the default branch
```
json
[
{
[
{
"name"
:
"assets"
,
"type"
:
"tree"
,
"mode"
:
"040000"
,
"id"
:
"6229c43a7e16fcc7e95f923f8ddadb8281d9c6c6"
},
{
},
{
"name"
:
"contexts"
,
"type"
:
"tree"
,
"mode"
:
"040000"
,
"id"
:
"faf1cdf33feadc7973118ca42d35f1e62977e91f"
},
{
},
{
"name"
:
"controllers"
,
"type"
:
"tree"
,
"mode"
:
"040000"
,
"id"
:
"95633e8d258bf3dfba3a5268fb8440d263218d74"
},
{
},
{
"name"
:
"Rakefile"
,
"type"
:
"blob"
,
"mode"
:
"100644"
,
"id"
:
"35b2f05cbb4566b71b34554cf184a9d0bd9d46d6"
},
{
},
{
"name"
:
"VERSION"
,
"type"
:
"blob"
,
"mode"
:
"100644"
,
"id"
:
"803e4a4f3727286c3093c63870c2b6524d30ec4f"
},
{
},
{
"name"
:
"config.ru"
,
"type"
:
"blob"
,
"mode"
:
"100644"
,
"id"
:
"dfd2d862237323aa599be31b473d70a8a817943b"
}]
}
]
```
...
...
doc/api/repository_files.md
View file @
3740597f
...
...
@@ -44,7 +44,7 @@ Example response:
```
json
{
"file_name"
:
"app/project.rb"
,
"branch_name"
:
"master"
,
"branch_name"
:
"master"
}
```
...
...
@@ -67,7 +67,7 @@ Example response:
```
json
{
"file_name"
:
"app/project.rb"
,
"branch_name"
:
"master"
,
"branch_name"
:
"master"
}
```
...
...
@@ -90,7 +90,7 @@ Example response:
```
json
{
"file_name"
:
"app/project.rb"
,
"branch_name"
:
"master"
,
"branch_name"
:
"master"
}
```
...
...
doc/api/session.md
View file @
3740597f
...
...
@@ -30,8 +30,8 @@ __You can login with both GitLab and LDAP credentials now__
"dark_scheme"
:
false
,
"theme_id"
:
1
,
"is_admin"
:
false
,
"can_create_group"
:
true
,
"can_create_team"
:
true
,
"can_create_project"
:
true
"can_create_group"
:
true
,
"can_create_team"
:
true
,
"can_create_project"
:
true
}
```
doc/api/system_hooks.md
View file @
3740597f
...
...
@@ -17,9 +17,9 @@ Parameters:
```
json
[
{
"id"
:
3
,
"url"
:
"http://example.com/hook"
,
"created_at"
:
"2013-10-02T10:15:31Z"
"id"
:
3
,
"url"
:
"http://example.com/hook"
,
"created_at"
:
"2013-10-02T10:15:31Z"
}
]
```
...
...
@@ -47,12 +47,12 @@ Parameters:
```
json
{
"event_name"
:
"project_create"
,
"name"
:
"Ruby"
,
"path"
:
"ruby"
,
"project_id"
:
1
,
"owner_name"
:
"Someone"
,
"owner_email"
:
"example@gitlabhq.com"
"event_name"
:
"project_create"
,
"name"
:
"Ruby"
,
"path"
:
"ruby"
,
"project_id"
:
1
,
"owner_name"
:
"Someone"
,
"owner_email"
:
"example@gitlabhq.com"
}
```
...
...
doc/api/users.md
View file @
3740597f
...
...
@@ -187,8 +187,8 @@ GET /user
"theme_id"
:
1
,
"color_scheme_id"
:
2
,
"is_admin"
:
false
,
"can_create_group"
:
true
,
"can_create_project"
:
true
"can_create_group"
:
true
,
"can_create_project"
:
true
}
```
...
...
@@ -205,17 +205,13 @@ GET /user/keys
[
{
"id"
:
1
,
"title"
:
"Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
"title"
:
"Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
},
{
"id"
:
3
,
"title"
:
"Another Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
"title"
:
"Another Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
}
]
```
...
...
@@ -240,10 +236,8 @@ Parameters:
```
json
{
"id"
:
1
,
"title"
:
"Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
"title"
:
"Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
}
```
...
...
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