Merge branch 'develop' into staging

This commit is contained in:
Guillaume Lazzara 2016-07-07 10:14:07 +02:00
commit 6e68fa97b4

View file

@ -3,5 +3,8 @@ class ApplicationController < ActionController::Base
# For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception
def default_url_options
return { protocol: 'https' } if Rails.env.staging? || Rails.env.production?
{}
end
end