From 141b8b67ff4cbe67778ff6815a51f49834e290b9 Mon Sep 17 00:00:00 2001
From: Michi302 <michi302@michi302.de>
Date: Mon, 28 Dec 2015 15:50:44 +0100
Subject: [PATCH 1/2] Make single user API endpoint return Entities::User
 instead of Entities::UserBasic

---
 doc/api/users.md | 7 +++++++
 lib/api/users.rb | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/api/users.md b/doc/api/users.md
index 66d2fd52526..773fe36d277 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -123,6 +123,13 @@ Parameters:
   "name": "John Smith",
   "state": "active",
   "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg",
+  "created_at": "2012-05-23T08:00:58Z",
+  "is_admin": false,
+  "bio": null,
+  "skype": "",
+  "linkedin": "",
+  "twitter": "",
+  "website_url": ""
 }
 ```
 
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 3400f0713ef..0d7813428e2 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -39,7 +39,7 @@ module API
         if current_user.is_admin?
           present @user, with: Entities::UserFull
         else
-          present @user, with: Entities::UserBasic
+          present @user, with: Entities::User
         end
       end
 

From 8393e3e04b8b336ec80cb0da49d273f709043120 Mon Sep 17 00:00:00 2001
From: Michi302 <michi302@michi302.de>
Date: Tue, 5 Jan 2016 19:05:41 +0100
Subject: [PATCH 2/2] Add missing changelog entry

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 57f0b9f30d5..698f4e5f1cf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 8.4.0 (unreleased)
   - Add CAS support (tduehr)
   - Add link to merge request on build detail page.
   - Revert back upvote and downvote button to the issue and MR pages
+  - Change single user API endpoint to return more detailed data (Michael Potthoff)
 
 v 8.3.2 (unreleased)
   - Disable --follow in `git log` to avoid loading duplicate commit data in infinite scroll (Stan Hu)