Merge branch 'hotfix-1.1.2' into master

app/views/landing/release_notes.html.erb

@@ -7,6 +7,17 @@
   <h1><%= t('landing.release_notes.title') %></h1>
 
   <div class="release-notes">
+    <!-- 1.1.2 -->
+    <div class="release">
+      <h2><span class="version">1.1.2</span>October 7th, 2018</h2>
+      <ul>
+        <li>
+          <div class="change change-fixed">fixed</div>
+          <p>Fixed a mail misconfiguration</p>
+        </li>
+      </ul>
+    </div>
+
     <!-- 1.1.1 -->
     <div class="release">
       <h2><span class="version">1.1.1</span> October 1st, 2018</h2>
@@ -160,4 +171,4 @@
       </ul>
     </div>
   </div>
-</div>
+</div>

config/credentials.yml.enc

@@ -1 +1 @@
-vbU9iGixjQZ+sxzEUNUjNpI11/Ivk1IJXrm7lGEMDiYKI1+TFos+iPL83edPTzgoqrlEAIUAvCmhzQgHKd2gEI+NBrvVhfqXh2Rrco1/NwKDhgeMjRoZiF0do5Mx9D+cxMwNpmJf0z7zWIH0GVGS1dhLLfCtI2xPj973VnpyMAXVXP8d9eQrM5luBSvAnNQN2BpyVrvoTng6aIo5ECMCT5WOxNXmAPsHc7SeWkcL3eeVfggE8/QNzu0RN0BhZ0wkqbs+Y3a2KAvrr91XtpKdWVtYhNzS0hPclIKG5qdPgQwRE7V0fDs14fGa6DmnVa1/QEUVAIfBEiq9buKA6PB6+i/Tg8tuQUjSALKwAtWAO+X6/S5uJyujV8NuT+1bw3Vm3wb5Cdr8lljDRzUKXfNUeQGnohMZXD9suakw--wpHbykduOVg3Y0P2--kaiS7DYTf6ZDCwCz/0OwLg==
+TfRifHjlBWy28gl5SannMU7aq1IGk/M/WksU/vQrTIeyGNMt5PeD6DI+lPsfJ0yojwWscLDrQerrU5f46aJZ4Y7hcreq6N6sWO3kgTNYE0ez61szzPiChnhWIHaDAEyMI6c4t2OyvsxZWYG2plsE+BECJZN7+pZGKdJ+xmRCbViLtfXv+u6mYf8hqrHadsKZLKEQNovXIwwHZR21PCePP96MDcgca2r21bhiXK6KyBX35halqLKmpGqmyJEyfIBggUz5xNueIwPXgkR8AXBkePRNfwOt7bksaqrqgJLzPYiNsGsXb/yATkofxGxHvICngyIQ5IaVnuCtF3xUDN/e51s0mqNrq1MJE9MHpYoqsnxsKvwue1MHtMAWBdoASyKuCWk8rirTn0gWNyn0+Efu2mmGTIeg8dPIkncuuTZFMQdIQXpMPPiPpRHUKaWfM6V4Uxk+TjBRb3k=--G7b32kig0a750zXN--r2QEZYzviLIkZpveI8POoA==

config/environments/production.rb

@@ -80,8 +80,8 @@
   config.action_mailer.smtp_settings = {
     address: 'smtp.gmail.com',
     port: 587,
-    user_name: '[email protected]',
-    password: 'metahan8773',
+    user_name: Rails.application.credentials.dig(:email, :user_name),
+    password: Rails.application.credentials.dig(:email, :password),
     authentication: 'plain',
     enable_starttls_auto: true
   }

config/locales/en.yml

@@ -6,7 +6,7 @@
 # available at http://guides.rubyonrails.org/i18n.html.
 
 en:
-  version: "version 1.1.1"
+  version: "version 1.1.2"
   achievement:
     wins:
       title: "Winner Winner Chicken Dinner %{level}"
@@ -204,4 +204,4 @@ en:
       description: "View a list of all achievements unlocked by %{player}"
   log:
     term_trap: "Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT"
-    intercept_term: "Unicorn master intercepting TERM and sending myself QUIT instead"
+    intercept_term: "Unicorn master intercepting TERM and sending myself QUIT instead"