Merge branch 'develop' into staging

This commit is contained in:
Xavier J 2017-01-10 11:03:22 +01:00
commit f538cd7ae8

View file

@ -1,6 +1,11 @@
class RootController < ApplicationController class RootController < ApplicationController
def index def index
route = Rails.application.routes.recognize_path(request.referrer)
begin
route = Rails.application.routes.recognize_path(request.referrer)
rescue ActionController::RoutingError
route = Rails.application.routes.recognize_path(new_user_session_path)
end
if Features.opensimplif if Features.opensimplif
unless !user_signed_in? && !administrateur_signed_in? && !gestionnaire_signed_in? unless !user_signed_in? && !administrateur_signed_in? && !gestionnaire_signed_in?