Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Mountney <david@twkie.net>2017-03-31 23:06:15 +0300
committerDJ Mountney <david@twkie.net>2017-04-04 20:18:56 +0300
commita766f60a0be65a5f8af3f4328c1bcdc505948d15 (patch)
tree59cac43333d9c8ce84380b01502b8824202e98d3 /app/services/users
parent93de37ce1bd0f5ce015287f0729d625ddf6f7390 (diff)
Inlude the password_automatically_check param as permitted config in the user create_service
This param is passed to service in two places, one is in the build_user for non ldap oauth users. And the other is in the initial production admin user seed data. Without this change, when setting up GitLab in a production environment, you were not being given the option of setting the root password on initial setup in the UI.
Diffstat (limited to 'app/services/users')
-rw-r--r--app/services/users/create_service.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/users/create_service.rb b/app/services/users/create_service.rb
index 193fcd85896..a847a71a66a 100644
--- a/app/services/users/create_service.rb
+++ b/app/services/users/create_service.rb
@@ -62,6 +62,7 @@ module Users
:email,
:external,
:force_random_password,
+ :password_automatically_set,
:hide_no_password,
:hide_no_ssh_key,
:key_id,
@@ -85,6 +86,7 @@ module Users
[
:email,
:email_confirmation,
+ :password_automatically_set,
:name,
:password,
:username