From 53cb71ebaa60e93b8dee834fea230a1a4331e8de Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <stobbsm@gmail.com>
Date: Mon, 20 Aug 2018 10:57:49 -0600
Subject: [PATCH 1/5] Added v-pre to textarea to fix view not working

---
 resources/views/dashboard/templates/edit.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/dashboard/templates/edit.blade.php b/resources/views/dashboard/templates/edit.blade.php
index d2df4162..f4c82ee1 100644
--- a/resources/views/dashboard/templates/edit.blade.php
+++ b/resources/views/dashboard/templates/edit.blade.php
@@ -52,7 +52,7 @@ window.addEventListener("DOMContentLoaded", function(e) {
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.incidents.templates.template') }}</label>
-                            <textarea name="template[template]" id="cm-editor" class="form-control" rows="8" placeholder="{{ trans('forms.incidents.templates.template') }}">{{ $template->template }}</textarea>
+                            <textarea v-pre name="template[template]" id="cm-editor" class="form-control" rows="8" placeholder="{{ trans('forms.incidents.templates.template') }}">{{ $template->template }}</textarea>
                             <span class="help-block">{!! trans('forms.incidents.templates.twig') !!}</span>
                         </div>
                     </fieldset>

From b389e4a3c9c495eb8c32fd4d2283aa074aeab0a2 Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <stobbsm@gmail.com>
Date: Mon, 20 Aug 2018 11:00:41 -0600
Subject: [PATCH 2/5] Reverted .env.example

---
 .env.example | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/.env.example b/.env.example
index 0ed277fe..7dfca241 100644
--- a/.env.example
+++ b/.env.example
@@ -1,13 +1,10 @@
 APP_ENV=production
 APP_DEBUG=false
 APP_URL=http://localhost
-APP_TIMEZONE=UTC
-APP_KEY=
-DEBUGBAR_ENABLED=false
+APP_KEY=SomeRandomString
 
 DB_DRIVER=mysql
 DB_HOST=localhost
-DB_UNIX_SOCKET=null
 DB_DATABASE=cachet
 DB_USERNAME=homestead
 DB_PASSWORD=secret
@@ -17,14 +14,11 @@ DB_PREFIX=null
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
-
-CACHET_BEACON=true
 CACHET_EMOJI=false
-CACHET_AUTO_TWITTER=true
 
-MAIL_DRIVER=log
-MAIL_HOST=null
-MAIL_PORT=null
+MAIL_DRIVER=smtp
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ADDRESS=null
@@ -36,9 +30,3 @@ REDIS_DATABASE=null
 REDIS_PORT=null
 
 GITHUB_TOKEN=null
-
-NEXMO_KEY=null
-NEXMO_SECRET=null
-NEXMO_SMS_FROM=Cachet
-
-TRUSTED_PROXIES=

From 6e426eabfaecd45a71508694852627609e44ba4b Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <stobbsm@gmail.com>
Date: Mon, 20 Aug 2018 11:07:44 -0600
Subject: [PATCH 3/5] Revert .env.example to 2.4 branch default

---
 .env.example | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/.env.example b/.env.example
index 7dfca241..0ed277fe 100644
--- a/.env.example
+++ b/.env.example
@@ -1,10 +1,13 @@
 APP_ENV=production
 APP_DEBUG=false
 APP_URL=http://localhost
-APP_KEY=SomeRandomString
+APP_TIMEZONE=UTC
+APP_KEY=
+DEBUGBAR_ENABLED=false
 
 DB_DRIVER=mysql
 DB_HOST=localhost
+DB_UNIX_SOCKET=null
 DB_DATABASE=cachet
 DB_USERNAME=homestead
 DB_PASSWORD=secret
@@ -14,11 +17,14 @@ DB_PREFIX=null
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
-CACHET_EMOJI=false
 
-MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
-MAIL_PORT=2525
+CACHET_BEACON=true
+CACHET_EMOJI=false
+CACHET_AUTO_TWITTER=true
+
+MAIL_DRIVER=log
+MAIL_HOST=null
+MAIL_PORT=null
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ADDRESS=null
@@ -30,3 +36,9 @@ REDIS_DATABASE=null
 REDIS_PORT=null
 
 GITHUB_TOKEN=null
+
+NEXMO_KEY=null
+NEXMO_SECRET=null
+NEXMO_SMS_FROM=Cachet
+
+TRUSTED_PROXIES=

From 6feed9e2ee6d806b09998408322424f5966b64f0 Mon Sep 17 00:00:00 2001
From: Nico Stapelbroek <nstapelbroek@gmail.com>
Date: Sun, 25 Nov 2018 13:40:11 +0100
Subject: [PATCH 4/5] Fix configuring postgres leads to wrong database driver
 key

---
 app/Console/Commands/InstallCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Console/Commands/InstallCommand.php b/app/Console/Commands/InstallCommand.php
index 06fd8410..a6878c0f 100644
--- a/app/Console/Commands/InstallCommand.php
+++ b/app/Console/Commands/InstallCommand.php
@@ -140,7 +140,7 @@ class InstallCommand extends Command
 
         $config['DB_DRIVER'] = $this->choice('Which database driver do you want to use?', [
             'mysql'      => 'MySQL',
-            'postgresql' => 'PostgreSQL',
+            'pgsql'      => 'PostgreSQL',
             'sqlite'     => 'SQLite',
         ], $config['DB_DRIVER']);
 

From 4fb2f3e7a7b34e67597cbd791d83f4365bc55701 Mon Sep 17 00:00:00 2001
From: Nico Stapelbroek <nstapelbroek@gmail.com>
Date: Sun, 25 Nov 2018 13:32:49 +0100
Subject: [PATCH 5/5] Add warning when setting up localhost with mysql driver

---
 app/Console/Commands/InstallCommand.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Console/Commands/InstallCommand.php b/app/Console/Commands/InstallCommand.php
index 06fd8410..8e048b69 100644
--- a/app/Console/Commands/InstallCommand.php
+++ b/app/Console/Commands/InstallCommand.php
@@ -148,6 +148,9 @@ class InstallCommand extends Command
             $config['DB_DATABASE'] = $this->ask('Please provide the full path to your SQLite file.', $config['DB_DATABASE']);
         } else {
             $config['DB_HOST'] = $this->ask("What is the host of your {$config['DB_DRIVER']} database?", $config['DB_HOST']);
+            if ($config['DB_HOST'] === 'localhost' && $config['DB_DRIVER'] === 'mysql') {
+                $this->warn("Using 'localhost' will result in the usage of a local unix socket. Use 127.0.0.1 if you want to connect over TCP");
+            }
 
             $config['DB_DATABASE'] = $this->ask('What is the name of the database that Cachet should use?', $config['DB_DATABASE']);