diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-13 23:20:02 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-13 23:20:02 +0200 |
| commit | 506709485c8be7a3fb26e4fa6f7d1ea0ad999280 (patch) | |
| tree | 0252265fe431830e61c880b61789504eaefa4586 /lib | |
| parent | 632fe8fbe1af9653fec6ecbb5c3e5c66d738641c (diff) | |
| parent | 6f5a9b4110bc5e88b7c7ed9fb6a03d6158ad247d (diff) | |
| download | gitlab-ce-506709485c8be7a3fb26e4fa6f7d1ea0ad999280.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 8557fa074d4..9c9c7fcd6ea 100644 --- 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 |