summaryrefslogtreecommitdiff
path: root/lib/gitlab/auth
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-22 09:08:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-22 09:08:39 +0000
commit001243986195143c395a9811d8254bbf1b9ebfa1 (patch)
tree6d6d665154fd38beea6ea7f8985330f956565bb3 /lib/gitlab/auth
parent83d8c1d61762898eb4e69878f117cbb2ef5be494 (diff)
downloadgitlab-ce-001243986195143c395a9811d8254bbf1b9ebfa1.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/auth')
-rw-r--r--lib/gitlab/auth/o_auth/auth_hash.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth/o_auth/auth_hash.rb b/lib/gitlab/auth/o_auth/auth_hash.rb
index 76f2827af1a..b37a9225dd7 100644
--- a/lib/gitlab/auth/o_auth/auth_hash.rb
+++ b/lib/gitlab/auth/o_auth/auth_hash.rb
@@ -34,7 +34,7 @@ module Gitlab
end
def password
- @password ||= Gitlab::Utils.force_utf8(Devise.friendly_token[0, 8].downcase)
+ @password ||= Gitlab::Utils.force_utf8(::User.random_password.downcase)
end
def location