From 312a29e8eef5caf89c6cf3ef66e2b7cf50d6b2d0 Mon Sep 17 00:00:00 2001
From: Oly <oliver.marks@influentialsoftware.com>
Date: Tue, 28 Feb 2017 09:03:01 +0000
Subject: [PATCH] disable redis for now, add markdown tag for blog display

---
 dev.yml                              | 4 ++--
 docker-compose.yml                   | 4 ++--
 live.yml                             | 6 ++----
 mhackspace/templates/blog/posts.html | 4 ++--
 stage.yml                            | 4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/dev.yml b/dev.yml
index 647545b..8d44769 100644
--- a/dev.yml
+++ b/dev.yml
@@ -41,5 +41,5 @@ services:
     command: npm install
     volumes:
       - ./:/usr/src/app
-  redis:
-    image: redis:latest
+  # redis:
+  #   image: redis:latest
diff --git a/docker-compose.yml b/docker-compose.yml
index 891b98a..d697e90 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -71,6 +71,6 @@ services:
 #      - TERM=xterm
 
 
-  redis:
-    image: redis:latest
+  # redis:
+  #   image: redis:latest
 
diff --git a/live.yml b/live.yml
index d88e634..f32fba3 100644
--- a/live.yml
+++ b/live.yml
@@ -30,14 +30,12 @@ services:
       - .:/app
       - sockets:/data/sockets
 
-
-
   node:
     image: node:7-onbuild
     command: npm install
     volumes:
       - ./:/usr/src/app
 
-  redis:
-    image: redis:latest
+  # redis:
+  #   image: redis:latest
 
diff --git a/mhackspace/templates/blog/posts.html b/mhackspace/templates/blog/posts.html
index 385eb9f..3efa877 100644
--- a/mhackspace/templates/blog/posts.html
+++ b/mhackspace/templates/blog/posts.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-
+{% load dractags %}
 {% block title %}Blog Posts{% endblock %}
 
 {% block content %}
@@ -8,7 +8,7 @@
     {% for post in posts %}
     <a href="{{ post.get_absolute_url }}"><h1>{{ post.title }}</h1></a>
     <p>Published: {{ post.published_date }}</p>
-    <p>{{ post.description }}</p>
+    <p>{{ post.description|safe_markdown }}</p>
     {% endfor %}
 
     {% if posts.num_pages > 1 %}
diff --git a/stage.yml b/stage.yml
index f74d0e6..208098e 100644
--- a/stage.yml
+++ b/stage.yml
@@ -38,6 +38,6 @@ services:
     volumes:
       - ./:/usr/src/app
 
-  redis:
-    image: redis:latest
+  # redis:
+  #   image: redis:latest