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

This commit is contained in:
Dmitriy Zaporozhets
2014-03-13 23:20:02 +02:00
+1 -1
View File
@@ -15,7 +15,7 @@ module API
end
class UserSafe < Grape::Entity
expose :name
expose :name, :username
end
class UserBasic < Grape::Entity