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

50670948 · Dmitriy Zaporozhets · 632fe8fb · 6f5a9b41 · 50670948
Commit 50670948 authored Mar 13, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/api/entities.rb lib/api/entities.rb +1 -1

No files found.
--- a/lib/api/entities.rb
+++ b/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