forked from bofh/fetsite
Merge branch 'master' of https://github.com/andreassteph/fetsite
This commit is contained in:
@@ -13,6 +13,6 @@ class ApplicationController < ActionController::Base
|
||||
end
|
||||
end
|
||||
def default_url_options
|
||||
{locale: I18n.locale, host:"glonass.htu.tuwien.ac.at"}
|
||||
{locale: I18n.locale}
|
||||
end
|
||||
end
|
||||
|
||||
@@ -15,7 +15,7 @@ Fetsite::Application.configure do
|
||||
|
||||
# Don't care if the mailer can't send
|
||||
config.action_mailer.raise_delivery_errors = false
|
||||
config.action_mailer.default_url_options = { :host => 'glonass.htu.tuwien.ac.at' }
|
||||
config.action_mailer.default_url_options = {} # :host => 'glonass.htu.tuwien.ac.at' }
|
||||
# Print deprecation notices to the Rails logger
|
||||
config.active_support.deprecation = :log
|
||||
|
||||
|
||||
Reference in New Issue
Block a user