summaryrefslogtreecommitdiff
path: root/app/controllers/oauth/authorizations_controller.rb
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-02-19 14:22:06 +0100
committerJames Lopez <james@jameslopez.es>2016-02-19 14:22:06 +0100
commitce45389a4d9b9405112a22daaa4e6808201414e0 (patch)
treea6f1662cff8e9fa3609a700d6dd5b8942d1f7001 /app/controllers/oauth/authorizations_controller.rb
parent097b635b49e50b459509213e38e417215c50b878 (diff)
downloadgitlab-ce-ce45389a4d9b9405112a22daaa4e6808201414e0.tar.gz
another attempt to fix oauth issue
Diffstat (limited to 'app/controllers/oauth/authorizations_controller.rb')
-rw-r--r--app/controllers/oauth/authorizations_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index 874af5de243..c721dca58d9 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -7,7 +7,7 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
if pre_auth.authorizable?
if skip_authorization? || matching_token?
auth = authorization.authorize
- reset_session
+ session.delete(:user_return_to)
redirect_to auth.redirect_uri
else
render "doorkeeper/authorizations/new"