Merge branch 'master' into registry-186

config/application-example.yml

@@ -21,7 +21,7 @@ smtp_openssl_verify_mode: 'peer' # 'none', 'peer', 'client_once','fail_if_no_pee
 smtp_enable_starttls_auto: 'true' # 'false'
 # If your mail server requires authentication, please change.
 smtp_authentication: 'plain' # 'plain', 'login', 'cram_md5'
-registrant_url: 'https:/registrant.example.com' # for valid email body registrant links
+registrant_url: 'https://registrant.example.com' # for valid email body registrant links
 # Staging env does not send any emails unless they are whitelisted
 whitelist_emails_for_staging: >
   test@example.org,

config/application.rb

@@ -60,6 +60,10 @@ module Registry
       g.helper false
     end
 
+    registrant_portal_uri = URI.parse(ENV['registrant_url'])
+    config.action_mailer.default_url_options = { host: registrant_portal_uri.host,
+                                                 protocol: registrant_portal_uri.scheme }
+
     config.action_mailer.delivery_method = :smtp
     config.action_mailer.perform_deliveries = true
     config.action_mailer.raise_delivery_errors = true

config/environments/development-example.rb

@@ -33,11 +33,6 @@ Rails.application.configure do
 
   config.action_view.raise_on_missing_translations = true
 
-  config.action_mailer.raise_delivery_errors = false
-  config.action_mailer.default_url_options = { host: 'localhost:8081' }
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = { address: 'localhost', port: 1025 } # MailCatcher
-
   # for finding database optimization
   config.after_initialize do
     Bullet.enable = true