diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-11 15:44:42 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-11 15:44:42 +0000 |
commit | 9b177bb7c94df6c7d3868235f75939a41acf8718 (patch) | |
tree | ef8541d3ef8047f2ac6711b6e030244f812b7b49 /lib/api/entities.rb | |
parent | 73a913f2b5f2a5dd36e13e09d74264d1da218d6a (diff) | |
download | gitlab-ce-9b177bb7c94df6c7d3868235f75939a41acf8718.tar.gz |
Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8
This reverts merge request !14148
Diffstat (limited to 'lib/api/entities.rb')
-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 216408064d1..52c49e5caa9 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -45,7 +45,7 @@ module API expose :confirmed_at expose :last_activity_on expose :email - expose :color_scheme_id, :projects_limit, :current_sign_in_at + expose :theme_id, :color_scheme_id, :projects_limit, :current_sign_in_at expose :identities, using: Entities::Identity expose :can_create_group?, as: :can_create_group expose :can_create_project?, as: :can_create_project |