diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-29 23:03:46 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-29 23:03:46 -0700 |
| commit | 836104b41a557e8411d422c0dca7930e85b0de95 (patch) | |
| tree | 5a45ebe5475209a098a6c8d818488ef35d18030e /lib/api/entities.rb | |
| parent | e48c6fab60d57b4af31f5b5d3e81ba09e4e68881 (diff) | |
| parent | 5b657a65d4ec309be2cb7dfcacf85e98d59a4eb0 (diff) | |
| download | gitlab-ce-836104b41a557e8411d422c0dca7930e85b0de95.tar.gz | |
Merge pull request #5213 from bladealslayer/feature/user_api_extended
Extended User API to expose admin and can_create_group for user creation...
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 1f35e9ec5fc..ab949f530ab 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -3,6 +3,9 @@ module API class User < Grape::Entity expose :id, :username, :email, :name, :bio, :skype, :linkedin, :twitter, :theme_id, :color_scheme_id, :state, :created_at, :extern_uid, :provider + expose :is_admin?, as: :is_admin + expose :can_create_group?, as: :can_create_group + expose :can_create_project?, as: :can_create_project end class UserSafe < Grape::Entity @@ -15,10 +18,6 @@ module API class UserLogin < User expose :private_token - expose :is_admin?, as: :is_admin - expose :can_create_group?, as: :can_create_group - expose :can_create_project?, as: :can_create_project - expose :can_create_team?, as: :can_create_team end class Hook < Grape::Entity |