Download as
Browse Code »

Commit 1b0198f1d3fc621b339af0e7fd79a74919856d46

Authored by Florian Unglaub
1 parent 6d6c7a17
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

save newly created users directly in the model

Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
app/controllers/omniauth_callbacks_controller.rb
  Diff comments   View file @1b0198f
@@ -39,7 +39,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController @@ -39,7 +39,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
39 redirect_to profile_path 39 redirect_to profile_path
40 else 40 else
41 @user = User.find_or_new_for_omniauth(oauth) 41 @user = User.find_or_new_for_omniauth(oauth)
42 - @user.save! if @user.try('new_record?')  
43 42
44 if @user 43 if @user
45 sign_in_and_redirect @user 44 sign_in_and_redirect @user
app/models/user.rb
  Diff comments   View file @1b0198f
@@ -114,6 +114,8 @@ class User < ActiveRecord::Base @@ -114,6 +114,8 @@ class User < ActiveRecord::Base
114 ) 114 )
115 115
116 @user.blocked = true if Gitlab.config.omniauth.block_auto_created_users 116 @user.blocked = true if Gitlab.config.omniauth.block_auto_created_users
  117 + @user.save!
  118 +
117 @user 119 @user
118 end 120 end
119 end 121 end