Commit 88d4559e62f4e49de6b3ceab2620e418c11eb7f6
1 parent
810851f5
Exists in
master
and in
4 other branches
Removed private scope
Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
Showing
2 changed files
with
1 additions
and
3 deletions
Show diff stats
app/models/user.rb
| @@ -383,8 +383,6 @@ class User < ActiveRecord::Base | @@ -383,8 +383,6 @@ class User < ActiveRecord::Base | ||
| 383 | end | 383 | end |
| 384 | end | 384 | end |
| 385 | 385 | ||
| 386 | - private | ||
| 387 | - | ||
| 388 | def with_defaults | 386 | def with_defaults |
| 389 | User.defaults.each do |k,v| | 387 | User.defaults.each do |k,v| |
| 390 | self.send("#{k}=",v) | 388 | self.send("#{k}=",v) |
lib/gitlab/oauth/user.rb
| @@ -27,7 +27,7 @@ module Gitlab | @@ -27,7 +27,7 @@ module Gitlab | ||
| 27 | password_confirmation: password, | 27 | password_confirmation: password, |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | - user = model.new(opts, as: :admin).with_defaults | 30 | + user = model.build_user(opts, as: :admin) |
| 31 | user.save! | 31 | user.save! |
| 32 | log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}" | 32 | log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}" |
| 33 | 33 |