diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-09-02 11:55:18 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-09-02 11:55:18 +0000 |
| commit | 81002745184df28fc9d969afc524986279c653bb (patch) | |
| tree | 386724b936531148dfe98110aa214b6deb0aa84a /lib | |
| parent | 1e60725174cf8cfac1b54bbcdb1453d74bfdd37e (diff) | |
| parent | 92edb3edab89dcb7b87bad3ac0fe7fed404fea85 (diff) | |
| download | gitlab-ce-81002745184df28fc9d969afc524986279c653bb.tar.gz | |
Merge branch 'issue-discussions-refactor' into 'master'
Issue discussions Vue refactor
See merge request !12069
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 803b48dd88a..9df9a515990 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1,11 +1,11 @@ module API module Entities class UserSafe < Grape::Entity - expose :name, :username + expose :id, :name, :username end class UserBasic < UserSafe - expose :id, :state + expose :state expose :avatar_url do |user, options| user.avatar_url(only_path: false) end |