diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-07 15:56:00 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-07 15:56:00 +0000 |
| commit | f2421b2b97d81ef7631f1baefb4ba4401c8a04dc (patch) | |
| tree | 4cc7610789043fb53458490929c619261f43e9c4 /lib/api | |
| parent | 780dd6c6af0fe73026c88ef06fc277901bbef573 (diff) | |
| parent | 26264625cbc2692bc113c1e701cb15eecbd010d2 (diff) | |
| download | gitlab-ce-f2421b2b97d81ef7631f1baefb4ba4401c8a04dc.tar.gz | |
Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'
Add option to change navigation color palette
Closes #35012
See merge request !13619
Diffstat (limited to 'lib/api')
| -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 |