Download as
Browse Code »

Commit 121531cad752aea6b6388b01011120369f8931a3

Authored by Arthur Nogueira Neves
2 parents ec372340 dae66cf9
Exists in master and in 1 other branch production

Merge pull request #626 from lowang/master 

ActionMailer https protocol links
Showing 2 changed files with 6 additions and 1 deletions   Show diff stats
config/config.example.yml
  Diff comments   View file @121531c
@@ -15,6 +15,10 @@ host: errbit.example.com @@ -15,6 +15,10 @@ host: errbit.example.com
15 # Only set this if it isn't the default for the protocol (i.e.. 80 for HTTP, 443 for HTTPS) 15 # Only set this if it isn't the default for the protocol (i.e.. 80 for HTTP, 443 for HTTPS)
16 # port: 8080 16 # port: 8080
17 17
  18 +# The protocol for your errbit server.
  19 +# Only set if not running default HTTP
  20 +# protocol: https
  21 +
18 # Enforce SSL connections 22 # Enforce SSL connections
19 enforce_ssl: false 23 enforce_ssl: false
20 24
config/initializers/_load_config.rb
  Diff comments   View file @121531c
@@ -81,7 +81,8 @@ end @@ -81,7 +81,8 @@ end
81 (ActionMailer::Base.default_url_options ||= {}).tap do |default| 81 (ActionMailer::Base.default_url_options ||= {}).tap do |default|
82 options_from_config = { 82 options_from_config = {
83 host: Errbit::Config.host, 83 host: Errbit::Config.host,
84 - port: Errbit::Config.port 84 + port: Errbit::Config.port,
  85 + protocol: Errbit::Config.protocol
85 }.select { |k, v| v } 86 }.select { |k, v| v }
86 87
87 default.reverse_merge!(options_from_config) 88 default.reverse_merge!(options_from_config)