Merge remote-tracking branch 'origin/master' into redesign

featurist · Aug 20, 2021 · 4b8855f · 4b8855f
2 parents a3a4702 + a4dd2e9
commit 4b8855f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -375,4 +375,4 @@ RUBY VERSION
    ruby 2.6.5p114
 
 BUNDLED WITH
-   2.1.4
+   2.2.5
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -76,10 +76,10 @@
   config.i18n.fallbacks = true
 
   ActionMailer::Base.smtp_settings = {
-    address: 'smtp.sendgrid.net',
+    address: ENV['SMTP_SERVER'],
     port: 587,
-    user_name: ENV['SENDGRID_USERNAME'],
-    password: ENV['SENDGRID_PASSWORD'],
+    user_name: ENV['SMTP_USERNAME'],
+    password: ENV['SMTP_PASSWORD'],
     domain: 'carbonneutralmap.org.uk',
     authentication: :plain,
     enable_starttls_auto: true
-Original file line number
+Diff line change
@@ Expand Up / @@ -375,4 +375,4 @@ RUBY VERSION @@
        ruby 2.6.5p114
     BUNDLED WITH
-.1.4
+.2.5