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
Kazuhiko Shiozaki
gitlab-ce
Commits
6ac5960b
Commit
6ac5960b
authored
Aug 30, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4955 from jojosch/api-help-example-fixes
add missing comma(s) in api examples
parents
7008ace6
cbae8097
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
doc/api/deploy_keys.md
doc/api/deploy_keys.md
+3
-3
doc/api/session.md
doc/api/session.md
+1
-1
doc/api/users.md
doc/api/users.md
+8
-8
No files found.
doc/api/deploy_keys.md
View file @
6ac5960b
...
@@ -16,14 +16,14 @@ Parameters:
...
@@ -16,14 +16,14 @@ Parameters:
[
[
{
{
"id"
:
1
,
"id"
:
1
,
"title"
:
"Public key"
"title"
:
"Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
},
},
{
{
"id"
:
3
,
"id"
:
3
,
"title"
:
"Another Public key"
"title"
:
"Another Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
...
@@ -48,7 +48,7 @@ Parameters:
...
@@ -48,7 +48,7 @@ Parameters:
```
json
```
json
{
{
"id"
:
1
,
"id"
:
1
,
"title"
:
"Public key"
"title"
:
"Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
...
...
doc/api/session.md
View file @
6ac5960b
...
@@ -27,7 +27,7 @@ __You can login with both GitLab and LDAP credentials now__
...
@@ -27,7 +27,7 @@ __You can login with both GitLab and LDAP credentials now__
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
"dark_scheme"
:
false
,
"dark_scheme"
:
false
,
"theme_id"
:
1
"theme_id"
:
1
,
"is_admin"
:
false
,
"is_admin"
:
false
,
"can_create_group"
:
true
,
"can_create_group"
:
true
,
"can_create_team"
:
true
,
"can_create_team"
:
true
,
...
...
doc/api/users.md
View file @
6ac5960b
...
@@ -22,7 +22,7 @@ GET /users
...
@@ -22,7 +22,7 @@ GET /users
"twitter"
:
""
,
"twitter"
:
""
,
"extern_uid"
:
"john.smith"
,
"extern_uid"
:
"john.smith"
,
"provider"
:
"provider_name"
,
"provider"
:
"provider_name"
,
"theme_id"
:
1
"theme_id"
:
1
,
"color_scheme_id"
:
2
"color_scheme_id"
:
2
},
},
{
{
...
@@ -38,7 +38,7 @@ GET /users
...
@@ -38,7 +38,7 @@ GET /users
"twitter"
:
""
,
"twitter"
:
""
,
"extern_uid"
:
"jack.smith"
,
"extern_uid"
:
"jack.smith"
,
"provider"
:
"provider_name"
,
"provider"
:
"provider_name"
,
"theme_id"
:
1
"theme_id"
:
1
,
"color_scheme_id"
:
3
"color_scheme_id"
:
3
}
}
]
]
...
@@ -71,7 +71,7 @@ Parameters:
...
@@ -71,7 +71,7 @@ Parameters:
"twitter"
:
""
,
"twitter"
:
""
,
"extern_uid"
:
"john.smith"
,
"extern_uid"
:
"john.smith"
,
"provider"
:
"provider_name"
,
"provider"
:
"provider_name"
,
"theme_id"
:
1
"theme_id"
:
1
,
"color_scheme_id"
:
2
"color_scheme_id"
:
2
}
}
```
```
...
@@ -162,8 +162,8 @@ GET /user
...
@@ -162,8 +162,8 @@ GET /user
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
"theme_id"
:
1
"theme_id"
:
1
,
"color_scheme_id"
:
2
"color_scheme_id"
:
2
,
"is_admin"
:
false
,
"is_admin"
:
false
,
"can_create_group"
:
true
,
"can_create_group"
:
true
,
"can_create_team"
:
true
,
"can_create_team"
:
true
,
...
@@ -184,14 +184,14 @@ GET /user/keys
...
@@ -184,14 +184,14 @@ GET /user/keys
[
[
{
{
"id"
:
1
,
"id"
:
1
,
"title"
:
"Public key"
"title"
:
"Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
},
},
{
{
"id"
:
3
,
"id"
:
3
,
"title"
:
"Another Public key"
"title"
:
"Another Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
...
@@ -219,7 +219,7 @@ Parameters:
...
@@ -219,7 +219,7 @@ Parameters:
```
json
```
json
{
{
"id"
:
1
,
"id"
:
1
,
"title"
:
"Public key"
"title"
:
"Public key"
,
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
"key"
:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+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