From 68e076a5d62f389752297b1e2b1db24c229b36b8 Mon Sep 17 00:00:00 2001
From: jcwimer <jacob.wimer@gmail.com>
Date: Mon, 18 Jan 2016 20:11:12 +0000
Subject: [PATCH] moved mail settings to production.rb

---
 config/application.rb             |  9 +--------
 config/environments/production.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 6df4a5c..80a1c83 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -29,14 +29,7 @@ module Wrestling
     
     config.active_job.queue_adapter = :delayed_job
     
-    config.action_mailer.delivery_method = :smtp
-    config.action_mailer.smtp_settings = {
-      :address => "localhost",
-      :port => 25,
-      :domain => "wrestlingdev.com",
-    }
-    #Devise needs origin of email
-    config.action_mailer.default_url_options = { :host => 'wrestlingdev.com' }
+    
   end
 
   
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 03dd831..1fc9943 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -96,4 +96,14 @@ Wrestling::Application.configure do
 
   #Added by me to force SSL in production
   config.force_ssl = true
+  
+  #Mail
+  config.action_mailer.delivery_method = :smtp
+    config.action_mailer.smtp_settings = {
+      :address => "localhost",
+      :port => 25,
+      :domain => "wrestlingdev.com",
+    }
+    #Devise needs origin of email
+    config.action_mailer.default_url_options = { :host => 'wrestlingdev.com' }
 end