diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-04 19:41:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-04 19:41:50 +0000 |
| commit | 4dd841c95aea291544bf69e796a757ba82f06a77 (patch) | |
| tree | 05649b57044b0a7945f1731b5ce1fcda7173ee2c /app | |
| parent | 050bafaa7c8487b0a63416b04143d83c43ec4101 (diff) | |
| parent | a766f60a0be65a5f8af3f4328c1bcdc505948d15 (diff) | |
| download | gitlab-ce-4dd841c95aea291544bf69e796a757ba82f06a77.tar.gz | |
Merge branch 'fix-password-required-check' into 'master'
Inlude the password_automatically_check param as permitted config in the user create_service
Closes #30335
See merge request !10386
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/users/create_service.rb | 2 |
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 |