Merge branch 'develop' into feature/billing-no-authenticated-payments

Conflicts:
	billing/config/locales/en.yml

1 files changed, 3 insertions, 2 deletions

diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb
index 0494b51..ca228c2 100644
--- a/users/app/controllers/sessions_controller.rb
+++ b/users/app/controllers/sessions_controller.rb
@@ -1,6 +1,7 @@
 class SessionsController < ApplicationController
 
   def new
+    redirect_to root_path if logged_in?
     @session = Session.new
     if authentication_errors
       @errors = authentication_errors
@@ -14,12 +15,12 @@ class SessionsController < ApplicationController
   end
 
   #
-  # this is a bad hack, but user_overview_url(user) is not available
+  # this is a bad hack, but user_url(user) is not available
   # also, this doesn't work because the redirect happens as a PUT. no idea why.
   #
   #Warden::Manager.after_authentication do |user, auth, opts|
   #  response = Rack::Response.new
-  #  response.redirect "/users/#{user.id}/overview"
+  #  response.redirect "/users/#{user.id}"
   # throw :warden, response.finish
   #end