From 4629cc44d6b7fa7ebdec8ce47bb0825e255d7763 Mon Sep 17 00:00:00 2001
From: Nihad Abbasov <narkoz.2008@gmail.com>
Date: Wed, 26 Sep 2012 11:06:31 -0700
Subject: [PATCH] fix mass assignment error in create_from_omniauth after
 a6a229a

---
 lib/gitlab/auth.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 90bd5d740..500cb64df 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -30,7 +30,7 @@ module Gitlab
       log.info "#{ldap_prefix}Creating user from #{provider} login"\
         " {uid => #{uid}, name => #{name}, email => #{email}}"
       password = Devise.friendly_token[0, 8].downcase
-      @user = User.new(
+      @user = User.new({
         extern_uid: uid,
         provider: provider,
         name: name,
@@ -38,7 +38,7 @@ module Gitlab
         password: password,
         password_confirmation: password,
         projects_limit: Gitlab.config.default_projects_limit,
-      )
+      }, as: :admin)
       if Gitlab.config.omniauth['block_auto_created_users'] && !ldap
         @user.blocked = true
       end
-- 
2.11.0