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
Boxiang Sun
gitlab-ce
Commits
585b1b3f
Commit
585b1b3f
authored
Sep 25, 2018
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add user's public_email attribute to api
parent
0a94bdfa
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
1 deletion
+14
-1
doc/api/deployments.md
doc/api/deployments.md
+2
-0
doc/api/jobs.md
doc/api/jobs.md
+5
-0
doc/api/keys.md
doc/api/keys.md
+1
-0
doc/api/runners.md
doc/api/runners.md
+1
-0
doc/api/users.md
doc/api/users.md
+4
-0
lib/api/entities.rb
lib/api/entities.rb
+1
-1
No files found.
doc/api/deployments.md
View file @
585b1b3f
...
@@ -55,6 +55,7 @@ Example of response
...
@@ -55,6 +55,7 @@ Example of response
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
""
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
@@ -113,6 +114,7 @@ Example of response
...
@@ -113,6 +114,7 @@ Example of response
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
""
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
...
doc/api/jobs.md
View file @
585b1b3f
...
@@ -62,6 +62,7 @@ Example of response
...
@@ -62,6 +62,7 @@ Example of response
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
""
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
@@ -120,6 +121,7 @@ Example of response
...
@@ -120,6 +121,7 @@ Example of response
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
""
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
@@ -193,6 +195,7 @@ Example of response
...
@@ -193,6 +195,7 @@ Example of response
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
""
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
@@ -251,6 +254,7 @@ Example of response
...
@@ -251,6 +254,7 @@ Example of response
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
""
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
@@ -322,6 +326,7 @@ Example of response
...
@@ -322,6 +326,7 @@ Example of response
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"created_at"
:
"2015-12-21T13:14:24.077Z"
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
""
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
...
doc/api/keys.md
View file @
585b1b3f
...
@@ -28,6 +28,7 @@ Parameters:
...
@@ -28,6 +28,7 @@ Parameters:
"created_at"
:
"2015-09-03T07:24:01.670Z"
,
"created_at"
:
"2015-09-03T07:24:01.670Z"
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
"john@example.com"
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
...
doc/api/runners.md
View file @
585b1b3f
...
@@ -286,6 +286,7 @@ Example response:
...
@@ -286,6 +286,7 @@ Example response:
"created_at"
:
"2017-11-16T18:38:46.000Z"
,
"created_at"
:
"2017-11-16T18:38:46.000Z"
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
""
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
...
doc/api/users.md
View file @
585b1b3f
...
@@ -199,6 +199,7 @@ Parameters:
...
@@ -199,6 +199,7 @@ Parameters:
"created_at"
:
"2012-05-23T08:00:58Z"
,
"created_at"
:
"2012-05-23T08:00:58Z"
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
"john@example.com"
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
@@ -230,6 +231,7 @@ Parameters:
...
@@ -230,6 +231,7 @@ Parameters:
"is_admin"
:
false
,
"is_admin"
:
false
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
"john@example.com"
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
@@ -367,6 +369,7 @@ GET /user
...
@@ -367,6 +369,7 @@ GET /user
"created_at"
:
"2012-05-23T08:00:58Z"
,
"created_at"
:
"2012-05-23T08:00:58Z"
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
"john@example.com"
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
@@ -415,6 +418,7 @@ GET /user
...
@@ -415,6 +418,7 @@ GET /user
"is_admin"
:
false
,
"is_admin"
:
false
,
"bio"
:
null
,
"bio"
:
null
,
"location"
:
null
,
"location"
:
null
,
"public_email"
:
"john@example.com"
,
"skype"
:
""
,
"skype"
:
""
,
"linkedin"
:
""
,
"linkedin"
:
""
,
"twitter"
:
""
,
"twitter"
:
""
,
...
...
lib/api/entities.rb
View file @
585b1b3f
...
@@ -53,7 +53,7 @@ module API
...
@@ -53,7 +53,7 @@ module API
class
User
<
UserBasic
class
User
<
UserBasic
expose
:created_at
,
if:
->
(
user
,
opts
)
{
Ability
.
allowed?
(
opts
[
:current_user
],
:read_user_profile
,
user
)
}
expose
:created_at
,
if:
->
(
user
,
opts
)
{
Ability
.
allowed?
(
opts
[
:current_user
],
:read_user_profile
,
user
)
}
expose
:bio
,
:location
,
:skype
,
:linkedin
,
:twitter
,
:website_url
,
:organization
expose
:bio
,
:location
,
:
public_email
,
:
skype
,
:linkedin
,
:twitter
,
:website_url
,
:organization
end
end
class
UserActivity
<
Grape
::
Entity
class
UserActivity
<
Grape
::
Entity
...
...
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