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
Tatuya Kamada
gitlab-ce
Commits
2366768d
Commit
2366768d
authored
Apr 13, 2016
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add changelog entry
parent
820c08ce
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG
CHANGELOG
+1
-0
lib/api/users.rb
lib/api/users.rb
+1
-1
No files found.
CHANGELOG
View file @
2366768d
...
@@ -12,6 +12,7 @@ v 8.7.0 (unreleased)
...
@@ -12,6 +12,7 @@ v 8.7.0 (unreleased)
- Project switcher uses new dropdown styling
- Project switcher uses new dropdown styling
- Load award emoji images separately unless opening the full picker. Saves several hundred KBs of data for most pages. (Connor Shea)
- Load award emoji images separately unless opening the full picker. Saves several hundred KBs of data for most pages. (Connor Shea)
- Do not include award_emojis in issue and merge_request comment_count !3610 (Lucas Charles)
- Do not include award_emojis in issue and merge_request comment_count !3610 (Lucas Charles)
- Restrict user profiles when public visibility level is restricted.
- All images in discussions and wikis now link to their source files !3464 (Connor Shea).
- All images in discussions and wikis now link to their source files !3464 (Connor Shea).
- Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu)
- Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu)
- Add setting for customizing the list of trusted proxies !3524
- Add setting for customizing the list of trusted proxies !3524
...
...
lib/api/users.rb
View file @
2366768d
...
@@ -40,7 +40,7 @@ module API
...
@@ -40,7 +40,7 @@ module API
get
":id"
do
get
":id"
do
@user
=
User
.
find
(
params
[
:id
])
@user
=
User
.
find
(
params
[
:id
])
if
current_user
.
present?
&&
current_user
.
is_admin?
if
current_user
&&
current_user
.
is_admin?
present
@user
,
with:
Entities
::
UserFull
present
@user
,
with:
Entities
::
UserFull
elsif
can?
(
current_user
,
:read_user
,
@user
)
elsif
can?
(
current_user
,
:read_user
,
@user
)
present
@user
,
with:
Entities
::
User
present
@user
,
with:
Entities
::
User
...
...
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