summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Leopard <mleopard@gitlab.com>2019-05-06 16:30:28 -0400
committerMichael Leopard <mleopard@gitlab.com>2019-05-06 16:30:28 -0400
commit24ecb8f9a915456fdf47bce23f9508775a06390f (patch)
tree5ac91c1c567e340eee719971cd86580ebc2b17d3
parent863f2bcfb6ef7c6d3ce5726fa1a602e12f05ef57 (diff)
downloadgitlab-ce-configure_dashboard_through_api.tar.gz
Exposing dashboard setting through the APIconfigure_dashboard_through_api
-rw-r--r--app/controllers/admin/users_controller.rb1
-rw-r--r--lib/api/entities.rb1
-rw-r--r--lib/api/users.rb1
3 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index a02d0843615..2b4204b3000 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -221,6 +221,7 @@ class Admin::UsersController < Admin::ApplicationController
:remember_me,
:skype,
:theme_id,
+ :dashboard,
:twitter,
:username,
:website_url
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 90ed24a2ded..51383411d43 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -80,6 +80,7 @@ module API
expose :two_factor_enabled?, as: :two_factor_enabled
expose :external
expose :private_profile
+ expose :dashboard
end
class UserWithAdmin < UserPublic
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 2f23e33bd4a..54bf5344460 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -50,6 +50,7 @@ module API
optional :external, type: Boolean, desc: 'Flag indicating the user is an external user'
optional :avatar, type: File, desc: 'Avatar image for user'
optional :private_profile, type: Boolean, desc: 'Flag indicating the user has a private profile'
+ optional :dashboard, type: String, desc: 'Default dashboard for user'
all_or_none_of :extern_uid, :provider
if Gitlab.ee?