Merge branch 'master' of github.com:gitlabhq/gitlabhq

Dmitriy Zaporozhets
2 parents 632fe8fb 6f5a9b41
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
lib/api/entities.rb
@@ -15,7 +15,7 @@ module API
     end
  
     class UserSafe < Grape::Entity
-      expose :name
+      expose :name, :username
     end
  
     class UserBasic < Grape::Entity
...	...	@@ -15,7 +15,7 @@ module API
15	15	end
16	16
17	17	class UserSafe < Grape::Entity
18		- expose :name
	18	+ expose :name, :username
19	19	end
20	20
21	21	class UserBasic < Grape::Entity
...	...