diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-04-13 15:37:17 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-04-18 11:12:28 -0300 |
| commit | 2366768d3b28ea70c91fc49c471e66152650d442 (patch) | |
| tree | f1cf6fdba0bd96f3f128bf949063251b27ee0f65 | |
| parent | 820c08cefd78e593e94012061be29000d523ffd0 (diff) | |
| download | gitlab-ce-2366768d3b28ea70c91fc49c471e66152650d442.tar.gz | |
Add changelog entry
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/api/users.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 571c31e63a2..3cb89582d53 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ v 8.7.0 (unreleased) - 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) - 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). - 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 diff --git a/lib/api/users.rb b/lib/api/users.rb index 315268fc0ca..ea6fa2dc8a8 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -40,7 +40,7 @@ module API get ":id" do @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 elsif can?(current_user, :read_user, @user) present @user, with: Entities::User |