From 88d4559e62f4e49de6b3ceab2620e418c11eb7f6 Mon Sep 17 00:00:00 2001 From: Izaak Alpert Date: Wed, 11 Sep 2013 14:03:26 -0400 Subject: [PATCH] Removed private scope Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0 --- app/models/user.rb | 2 -- lib/gitlab/oauth/user.rb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index e92f0847724..ea1b9419288 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -383,8 +383,6 @@ class User < ActiveRecord::Base end end - private - def with_defaults User.defaults.each do |k,v| self.send("#{k}=",v) diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb index 515c5b769e5..1b32b99f4ba 100644 --- a/lib/gitlab/oauth/user.rb +++ b/lib/gitlab/oauth/user.rb @@ -27,7 +27,7 @@ module Gitlab password_confirmation: password, } - user = model.new(opts, as: :admin).with_defaults + user = model.build_user(opts, as: :admin) user.save! log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}"