From c0980dc7a12a397dfab9de90afe34c54a69e37c6 Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Sat, 13 Jun 2015 16:57:53 +0200
Subject: [PATCH 1/2] Use HTML version of incident message in atom feed

Atom (not RSS) feeds are able to handle html in entry content, so it
makes sense to put HTML version of incident in it.
---
 app/Http/Controllers/AtomController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AtomController.php b/app/Http/Controllers/AtomController.php
index 2c9bbb39..df89e953 100644
--- a/app/Http/Controllers/AtomController.php
+++ b/app/Http/Controllers/AtomController.php
@@ -16,6 +16,7 @@ use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;
 use Illuminate\Support\Str;
 use Roumen\Feed\Facades\Feed;
+use GrahamCampbell\Markdown\Facades\Markdown;
 
 class AtomController extends AbstractController
 {
@@ -65,7 +66,7 @@ class AtomController extends AbstractController
             Setting::get('app_name'),
             Str::canonicalize(Setting::get('app_domain')).'#'.$incident->id,
             $incident->created_at->toAtomString(),
-            $incident->message
+            Markdown::convertToHtml($incident->message)
         );
     }
 }

From 6d851bf9f313e4f0234aad4fcf0a23863c29ac44 Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Sat, 13 Jun 2015 17:05:04 +0200
Subject: [PATCH 2/2] Correct from StyleCI recommendations

---
 app/Http/Controllers/AtomController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AtomController.php b/app/Http/Controllers/AtomController.php
index df89e953..fff6d530 100644
--- a/app/Http/Controllers/AtomController.php
+++ b/app/Http/Controllers/AtomController.php
@@ -14,9 +14,9 @@ namespace CachetHQ\Cachet\Http\Controllers;
 use CachetHQ\Cachet\Facades\Setting;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;
+use GrahamCampbell\Markdown\Facades\Markdown;
 use Illuminate\Support\Str;
 use Roumen\Feed\Facades\Feed;
-use GrahamCampbell\Markdown\Facades\Markdown;
 
 class AtomController extends AbstractController
 {