summaryrefslogtreecommitdiff
path: root/app/controllers/admin/users_controller.rb
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2017-08-17 10:37:36 -0500
committerRuben Davila <rdavila84@gmail.com>2017-09-06 12:54:09 -0500
commit6c49a628000605d1beb120431003abb329b9fd16 (patch)
tree03ede462b30999149411ec70287f6aad2507eb56 /app/controllers/admin/users_controller.rb
parent8d1321d66977dc50577cf23f7cb0a6e9caa8283e (diff)
downloadgitlab-ce-6c49a628000605d1beb120431003abb329b9fd16.tar.gz
Restore some changes from !9199
Diffstat (limited to 'app/controllers/admin/users_controller.rb')
-rw-r--r--app/controllers/admin/users_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index a99563b7100..635298bc24a 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -211,6 +211,7 @@ class Admin::UsersController < Admin::ApplicationController
:provider,
:remember_me,
:skype,
+ :theme_id,
:twitter,
:username,
:website_url