Download as
Browse Code »

Commit 88d4559e62f4e49de6b3ceab2620e418c11eb7f6

Authored by Izaak Alpert
1 parent 810851f5
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Removed private scope 

Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
Showing 2 changed files with 1 additions and 3 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @88d4559
... ... @@ -383,8 +383,6 @@ class User < ActiveRecord::Base
383 383 end
384 384 end
385 385  
386   - private
387   -
388 386 def with_defaults
389 387 User.defaults.each do |k,v|
390 388 self.send("#{k}=",v)
... ...
lib/gitlab/oauth/user.rb
  Diff comments   View file @88d4559
... ... @@ -27,7 +27,7 @@ module Gitlab
27 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 31 user.save!
32 32 log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}"
33 33  
... ...