From 1b0198f1d3fc621b339af0e7fd79a74919856d46 Mon Sep 17 00:00:00 2001
From: Florian Unglaub <florian.unglaub@nix-wie-weg.de>
Date: Fri, 31 Aug 2012 16:24:12 +0200
Subject: [PATCH] save newly created users directly in the model

---
 app/controllers/omniauth_callbacks_controller.rb | 1 -
 app/models/user.rb                               | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 248a75a..3be285b 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -39,7 +39,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
       redirect_to profile_path
     else
       @user = User.find_or_new_for_omniauth(oauth)
-      @user.save! if @user.try('new_record?')
 
       if @user
         sign_in_and_redirect @user
diff --git a/app/models/user.rb b/app/models/user.rb
index b956d4e..0d45b6e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -114,6 +114,8 @@ class User < ActiveRecord::Base
         )
 
         @user.blocked = true if Gitlab.config.omniauth.block_auto_created_users
+        @user.save!
+
         @user
       end
     end
--
libgit2 0.21.2