If the referer is not set, use fullpath.

2 files changed, 9 insertions, 1 deletions

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 9b7bd94c3a2..3f896f46c6c 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -2,7 +2,14 @@ class SessionsController < Devise::SessionsController
 
   def new
     if request.referer.present?
-      store_location_for(:redirect, URI(request.referer).path)
+      referer_uri = URI(request.referer)
+      if referer_uri.host == Gitlab.config.gitlab.host
+        store_location_for(:redirect, referer_uri.path)
+      else
+        store_location_for(:redirect, request.fullpath)
+      end
+    else
+      store_location_for(:redirect, request.fullpath)
     end
 
     super
diff --git a/features/steps/project/redirects.rb b/features/steps/project/redirects.rb
index 25d37fd7888..7e01735af95 100644
--- a/features/steps/project/redirects.rb
+++ b/features/steps/project/redirects.rb
@@ -17,6 +17,7 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
   end
 
   step 'I should see project "Community" home page' do
+    Gitlab.config.gitlab.stub(:host).and_return("www.example.com")
     within '.project-home-title' do
       page.should have_content 'Community'
     end