Merge pull request #5798 from criteo/skip_confirmation

Skip email confirmation with LDAP

Merge pull request #5798 from criteo/skip_confirmation
Skip email confirmation with LDAP
Dmitriy Zaporozhets
2 parents 1ab91d88 2c4e3e00
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
lib/gitlab/oauth/user.rb
@@ -28,8 +28,8 @@ module Gitlab
           }
  
           user = model.build_user(opts, as: :admin)
+          user.skip_confirmation!
           user.save!
-          user.confirm!
           log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}"
  
           if Gitlab.config.omniauth['block_auto_created_users'] && !ldap?
...	...	@@ -28,8 +28,8 @@ module Gitlab
28	28	}
29	29
30	30	user = model.build_user(opts, as: :admin)
	31	+ user.skip_confirmation!
31	32	user.save!
32		- user.confirm!
33	33	log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}"
34	34
35	35	if Gitlab.config.omniauth['block_auto_created_users'] && !ldap?
...	...