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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
a15fe61f
Commit
a15fe61f
authored
Mar 18, 2013
by
Alex Denisov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
API docs updated
parent
28e7d1a8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
doc/api/session.md
doc/api/session.md
+11
-1
doc/api/users.md
doc/api/users.md
+5
-0
lib/api/entities.rb
lib/api/entities.rb
+1
-1
No files found.
doc/api/session.md
View file @
a15fe61f
...
@@ -17,7 +17,17 @@ Parameters:
...
@@ -17,7 +17,17 @@ Parameters:
"email"
:
"john@example.com"
,
"email"
:
"john@example.com"
,
"name"
:
"John Smith"
,
"name"
:
"John Smith"
,
"private_token"
:
"dd34asd13as"
,
"private_token"
:
"dd34asd13as"
,
"blocked"
:
false
,
"created_at"
:
"2012-05-23T08:00:58Z"
,
"created_at"
:
"2012-05-23T08:00:58Z"
,
"blocked"
:
true
"bio"
:
null
,
"skype"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"dark_scheme"
:
false
,
"theme_id"
:
1
"is_admin"
:
false
,
"can_create_group"
:
true
,
"can_create_team"
:
true
,
"can_create_project"
:
true
}
}
```
```
doc/api/users.md
View file @
a15fe61f
...
@@ -154,6 +154,7 @@ GET /user
...
@@ -154,6 +154,7 @@ GET /user
"username"
:
"john_smith"
,
"username"
:
"john_smith"
,
"email"
:
"john@example.com"
,
"email"
:
"john@example.com"
,
"name"
:
"John Smith"
,
"name"
:
"John Smith"
,
"private_token"
:
"dd34asd13as"
,
"blocked"
:
false
,
"blocked"
:
false
,
"created_at"
:
"2012-05-23T08:00:58Z"
,
"created_at"
:
"2012-05-23T08:00:58Z"
,
"bio"
:
null
,
"bio"
:
null
,
...
@@ -162,6 +163,10 @@ GET /user
...
@@ -162,6 +163,10 @@ GET /user
"twitter"
:
""
,
"twitter"
:
""
,
"dark_scheme"
:
false
,
"dark_scheme"
:
false
,
"theme_id"
:
1
"theme_id"
:
1
"is_admin"
:
false
,
"can_create_group"
:
true
,
"can_create_team"
:
true
,
"can_create_project"
:
true
}
}
```
```
...
...
lib/api/entities.rb
View file @
a15fe61f
...
@@ -13,7 +13,7 @@ module Gitlab
...
@@ -13,7 +13,7 @@ module Gitlab
expose
:id
,
:username
,
:email
,
:name
,
:state
,
:created_at
expose
:id
,
:username
,
:email
,
:name
,
:state
,
:created_at
end
end
class
UserLogin
<
User
Basic
class
UserLogin
<
User
expose
:private_token
expose
:private_token
expose
:is_admin?
,
as: :is_admin
expose
:is_admin?
,
as: :is_admin
expose
:can_create_group?
,
as: :can_create_group
expose
:can_create_group?
,
as: :can_create_group
...
...
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