Update from upstream repo CachetHQ/Cachet

app/Http/Controllers/Api/IncidentTemplateController.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Http\Controllers\Api;
+
+use CachetHQ\Cachet\Models\IncidentTemplate;
+use GrahamCampbell\Binput\Facades\Binput;
+use Illuminate\Support\Facades\Request;
+
+class IncidentTemplateController extends AbstractApiController
+{
+    /**
+     * Get all incident templates.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function index()
+    {
+        $templates = IncidentTemplate::query();
+
+        if ($sortBy = Binput::get('sort')) {
+            $direction = Binput::has('order') && Binput::get('order') == 'desc';
+
+            $templates->sort($sortBy, $direction);
+        }
+
+        $templates = $templates->paginate(Binput::get('per_page', 20));
+
+        return $this->paginator($templates, Request::instance());
+    }
+
+    /**
+     * Get a single incident templates.
+     *
+     * @param \CachetHQ\Cachet\Models\IncidentTemplate $incidentTemplate
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function show(IncidentTemplate $incidentTemplate)
+    {
+        return $this->item($incidentTemplate);
+    }
+}

app/Http/Routes/ApiRoutes.php

@@ -47,8 +47,11 @@ public function map(Registrar $router)
                 $router->get('components/{component}', 'ComponentController@show');
 
                 $router->get('incidents', 'IncidentController@index');
-                $router->get('incidents/{incident}', 'IncidentController@show');
 
+                $router->get('incidents/templates', 'IncidentTemplateController@index');
+                $router->get('incidents/templates/{incident_template}', 'IncidentTemplateController@show');
+
+                $router->get('incidents/{incident}', 'IncidentController@show');
                 $router->get('incidents/{incident}/updates', 'IncidentUpdateController@index');
                 $router->get('incidents/{incident}/updates/{update}', 'IncidentUpdateController@show');
 

app/Subscribers/CommandSubscriber.php

@@ -15,7 +15,6 @@
 use CachetHQ\Cachet\Bus\Events\System\SystemWasResetEvent;
 use CachetHQ\Cachet\Bus\Events\System\SystemWasUpdatedEvent;
 use CachetHQ\Cachet\Settings\Cache;
-use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -128,7 +127,7 @@ public function fireResettingCommand(Command $command)
     }
 
     /**
-     * Handle the main bulk of the command, clear the settings and backup the database.
+     * Handle the main bulk of the command, clear the settings.
      *
      * @param \Illuminate\Console\Command $command
      *
@@ -141,27 +140,6 @@ protected function handleMainCommand(Command $command)
         $this->cache->clear();
 
         $command->line('Settings cache cleared!');
-
-        // SQLite does not backup.
-        if ($this->config->get('database.default') === 'sqlite') {
-            $command->line('Backup skipped: SQLite is not supported.');
-
-            return;
-        }
-
-        $command->line('Backing up database...');
-
-        try {
-            $command->call('backup:run', [
-                '--only-db'         => true,
-                '--no-interaction'  => true,
-            ]);
-        } catch (Exception $e) {
-            $command->error($e->getMessage());
-            $command->line('Backup skipped!');
-        }
-
-        $command->line('Backup completed!');
     }
 
     /**

composer.json

@@ -50,8 +50,7 @@
         "pragmarx/google2fa": "^0.7.1",
         "predis/predis": "^1.1",
         "roumen/feed": "^2.10",
-        "spatie/laravel-backup": "^5.9",
-        "twig/twig": "^1.26.1"
+        "twig/twig": "^1"
     },
     "require-dev": {
         "ext-sqlite3": "*",