Merge branch 'develop' into staging
This commit is contained in:
commit
6e68fa97b4
1 changed files with 4 additions and 1 deletions
|
@ -3,5 +3,8 @@ class ApplicationController < ActionController::Base
|
||||||
# For APIs, you may want to use :null_session instead.
|
# For APIs, you may want to use :null_session instead.
|
||||||
protect_from_forgery with: :exception
|
protect_from_forgery with: :exception
|
||||||
|
|
||||||
|
def default_url_options
|
||||||
|
return { protocol: 'https' } if Rails.env.staging? || Rails.env.production?
|
||||||
|
{}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue