diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 09:08:39 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 09:08:39 +0000 |
| commit | 001243986195143c395a9811d8254bbf1b9ebfa1 (patch) | |
| tree | 6d6d665154fd38beea6ea7f8985330f956565bb3 /app/services/users | |
| parent | 83d8c1d61762898eb4e69878f117cbb2ef5be494 (diff) | |
| download | gitlab-ce-001243986195143c395a9811d8254bbf1b9ebfa1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/users')
| -rw-r--r-- | app/services/users/build_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb index d18f20bc1db..56631bf2785 100644 --- a/app/services/users/build_service.rb +++ b/app/services/users/build_service.rb @@ -23,7 +23,7 @@ module Users @reset_token = user.generate_reset_token if params[:reset_password] if user_params[:force_random_password] - random_password = Devise.friendly_token.first(User.password_length.min) + random_password = User.random_password user.password = user.password_confirmation = random_password end end |