From 054c15e7b5f9967417a0ea03aad0c4d77afd3bca Mon Sep 17 00:00:00 2001
From: Godric <godric@0x3f.fr>
Date: Sat, 20 Oct 2012 00:38:07 +0300
Subject: [PATCH] enable Oauth login for existing regular users

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

diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 500cb64..5a24c5d 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -48,9 +48,13 @@ module Gitlab
 
     def find_or_new_for_omniauth(auth)
       provider, uid = auth.provider, auth.uid
+      email = auth.info.email.downcase unless auth.info.email.nil?
 
       if @user = User.find_by_provider_and_extern_uid(provider, uid)
         @user
+      elsif @user = User.find_by_email(email)
+        @user.update_attributes(:extern_uid => uid, :provider => provider)
+        @user
       else
         if Gitlab.config.omniauth['allow_single_sign_on']
           @user = create_from_omniauth(auth)
--
libgit2 0.21.2