From d22c1069d3a091e0c630aed84f25cef71907ecb5 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Sat, 19 Mar 2016 19:03:33 +0000
Subject: [PATCH] Merge branch 'fix/gitlab-omniauth-issue' into 'master'

attempting to fix omniauth problem

Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361

See merge request !2876
---
 app/controllers/oauth/authorizations_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index 24025d8c72..c721dca58d 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -7,6 +7,7 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
     if pre_auth.authorizable?
       if skip_authorization? || matching_token?
         auth = authorization.authorize
+        session.delete(:user_return_to)
         redirect_to auth.redirect_uri
       else
         render "doorkeeper/authorizations/new"