Skip to content

Commit

Permalink
I've got a problem that a href in emails sent by errbit didn't includ…
Browse files Browse the repository at this point in the history
…e https scheme. That commit resolves that issue
  • Loading branch information
Przemysław Wróblewski committed Dec 17, 2013
1 parent 8528b63 commit dae66cf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions config/config.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ host: errbit.example.com
# Only set this if it isn't the default for the protocol (i.e.. 80 for HTTP, 443 for HTTPS)
# port: 8080

# The protocol for your errbit server.
# Only set if not running default HTTP
# protocol: https

# Enforce SSL connections
enforce_ssl: false

Expand Down
3 changes: 2 additions & 1 deletion config/initializers/_load_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
(ActionMailer::Base.default_url_options ||= {}).tap do |default|
options_from_config = {
host: Errbit::Config.host,
port: Errbit::Config.port
port: Errbit::Config.port,
protocol: Errbit::Config.protocol
}.select { |k, v| v }

default.reverse_merge!(options_from_config)
Expand Down

0 comments on commit dae66cf

Please sign in to comment.