Merge pull request #611 from okriuchykhin/ok_SCI_1252

Fix root_url method unavailable in application_helper [SCI-1252]
This commit is contained in:
okriuchykhin 2017-05-11 11:15:00 +02:00 committed by GitHub
commit f239238064
4 changed files with 14 additions and 1 deletions

View file

@ -226,6 +226,7 @@ module ApplicationHelper
unless user.avatar(style) == '/images/icon_small/missing.png' unless user.avatar(style) == '/images/icon_small/missing.png'
return user.avatar(style) return user.avatar(style)
end end
URI.join(root_url, "/images/#{style}/missing.png").to_s URI.join(Rails.application.routes.url_helpers.root_url,
"/images/#{style}/missing.png").to_s
end end
end end

View file

@ -13,6 +13,10 @@ Rails.application.configure do
config.consider_all_requests_local = true config.consider_all_requests_local = true
config.action_controller.perform_caching = false config.action_controller.perform_caching = false
Rails.application.routes.default_url_options = {
host: Rails.application.secrets.mail_server_url
}
# Don't care if the mailer can't send. # Don't care if the mailer can't send.
config.action_mailer.default_url_options = { config.action_mailer.default_url_options = {
host: Rails.application.secrets.mail_server_url host: Rails.application.secrets.mail_server_url

View file

@ -14,6 +14,10 @@ Rails.application.configure do
config.consider_all_requests_local = false config.consider_all_requests_local = false
config.action_controller.perform_caching = true config.action_controller.perform_caching = true
Rails.application.routes.default_url_options = {
host: Rails.application.secrets.mail_server_url
}
# Don't care if the mailer can't send. # Don't care if the mailer can't send.
config.action_mailer.default_url_options = { config.action_mailer.default_url_options = {
host: Rails.application.secrets.mail_server_url host: Rails.application.secrets.mail_server_url

View file

@ -36,6 +36,10 @@ Rails.application.configure do
# ActionMailer::Base.deliveries array. # ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test config.action_mailer.delivery_method = :test
Rails.application.routes.default_url_options = {
host: Rails.application.secrets.mail_server_url
}
# Don't care if the mailer can't send. # Don't care if the mailer can't send.
config.action_mailer.default_url_options = { host: Rails.application.secrets.mail_server_url } config.action_mailer.default_url_options = { host: Rails.application.secrets.mail_server_url }
config.action_mailer.default_options = { from: Rails.application.secrets.mail_from } config.action_mailer.default_options = { from: Rails.application.secrets.mail_from }