summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-13 13:33:28 +0100
committerDouwe Maan <douwe@gitlab.com>2015-02-13 14:44:42 +0100
commit25e44d05300a6b5b35232b27b4ccb27f47f09a67 (patch)
treef46c5753255cae37b492a988ffffd9d1dd4d1f6d /lib
parent529188e4788991961796b1b6131389072ee61efb (diff)
downloadgitlab-ce-25e44d05300a6b5b35232b27b4ccb27f47f09a67.tar.gz
Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/oauth/user.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb
index 9f55e8c4950..c023d275703 100644
--- a/lib/gitlab/oauth/user.rb
+++ b/lib/gitlab/oauth/user.rb
@@ -85,11 +85,12 @@ module Gitlab
def user_attributes
{
- name: auth_hash.name,
- username: ::User.clean_username(auth_hash.username),
- email: auth_hash.email,
- password: auth_hash.password,
- password_confirmation: auth_hash.password
+ name: auth_hash.name,
+ username: ::User.clean_username(auth_hash.username),
+ email: auth_hash.email,
+ password: auth_hash.password,
+ password_confirmation: auth_hash.password,
+ password_automatically_set: true
}
end