From 32f2695b76306c6bd9a93cd3842b330c54989b57 Mon Sep 17 00:00:00 2001
From: simon <simon@journeyman.cc>
Date: Sun, 23 Jul 2017 20:20:06 +0100
Subject: [PATCH 1/3] Added cross-scripting field to auth form.

---
 resources/templates/auth.html | 45 ++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/resources/templates/auth.html b/resources/templates/auth.html
index ce56af0..87ffbe2 100644
--- a/resources/templates/auth.html
+++ b/resources/templates/auth.html
@@ -1,27 +1,28 @@
 {% extends "templates/base.html" %}
 {% block content %}
         <div id="content" class="auth">
-            <form action="{{servlet-context}}/auth" method="POST">
-                <input type="hidden" name="redirect-to" value="{{redirect-to}}"/>
-                {% if user %}
-                <p class="widget">
-                    <label for="submit">{{config.save-prompt}}</label>
-                    <input name="action" id="action" type="submit" class="action-dangerous" value="{{config.logout-label}}"/>
-                </p>
-                {% else %}
-                <p class="widget">
-                    <label for="username">{{config.your-uname-prompt}}</label>
-                    <input name="username" id="username" type="text" required/>
-                </p>
-                <p class="widget">
-                    <label for="password">{{config.old-pass-prompt}}</label>
-                    <input name="password" id="password" type="password" required/>
-                </p>
-                <p class="widget">
-                    <label for="submit">{{config.login-prompt}}</label>
-                    <input name="action" id="action" type="submit" class="action" value="{{config.login-label}}"/>
-                </p>
-                {% endif %}
-            </form>
+          <form action="{{servlet-context}}/auth" method="POST">
+            {% csrf-field %}
+            <input type="hidden" name="redirect-to" value="{{redirect-to}}"/>
+            {% if user %}
+            <p class="widget">
+              <label for="submit">{{config.save-prompt}}</label>
+              <input name="action" id="action" type="submit" class="action-dangerous" value="{{config.logout-label}}"/>
+            </p>
+            {% else %}
+            <p class="widget">
+              <label for="username">{{config.your-uname-prompt}}</label>
+              <input name="username" id="username" type="text" required/>
+            </p>
+            <p class="widget">
+              <label for="password">{{config.old-pass-prompt}}</label>
+              <input name="password" id="password" type="password" required/>
+            </p>
+            <p class="widget">
+              <label for="submit">{{config.login-prompt}}</label>
+              <input name="action" id="action" type="submit" class="action" value="{{config.login-label}}"/>
+            </p>
+            {% endif %}
+          </form>
         </div>
 {% endblock %}

From 94b3605afdc48448b7f5f30e4da50d0b0ce8a845 Mon Sep 17 00:00:00 2001
From: simon <simon@journeyman.cc>
Date: Tue, 8 Aug 2017 23:59:49 +0100
Subject: [PATCH 2/3] Nasty! Merge seems to have messed up?

---
 project.clj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/project.clj b/project.clj
index d6adb67..9344323 100644
--- a/project.clj
+++ b/project.clj
@@ -25,11 +25,7 @@
                  [org.slf4j/jcl-over-slf4j "1.7.25"]
 
                  [com.taoensso/tower "3.0.2" :exclusions [com.taoensso/encore]]
-<<<<<<< Temporary merge branch 1
                  [markdown-clj "0.9.99" :exclusions [com.keminglabs/cljx]]
-=======
-                 [markdown-clj "0.9.91" :exclusions [com.keminglabs/cljx]]
->>>>>>> Temporary merge branch 2
                  [crypto-password "0.2.0"]
                  [clj-jgit "0.8.9"]
                  [environ "1.1.0"]

From c425935670a61ef80639e5ce5f9bce45853005f5 Mon Sep 17 00:00:00 2001
From: simon <simon@journeyman.cc>
Date: Wed, 9 Aug 2017 00:26:11 +0100
Subject: [PATCH 3/3] Docker stuff.

---
 project.clj | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/project.clj b/project.clj
index 9344323..159f0b4 100644
--- a/project.clj
+++ b/project.clj
@@ -15,7 +15,6 @@
                  [com.cemerick/url "0.1.1"]
                  [ring-server "0.4.0"]
                  [selmer "1.10.9"]
-
                  [org.clojure/tools.logging "0.4.0"]
                  [com.taoensso/timbre "4.10.0"]
                  [com.fzakaria/slf4j-timbre "0.3.7"]
@@ -23,7 +22,6 @@
                  [org.slf4j/log4j-over-slf4j "1.7.25"]
                  [org.slf4j/jul-to-slf4j "1.7.25"]
                  [org.slf4j/jcl-over-slf4j "1.7.25"]
-
                  [com.taoensso/tower "3.0.2" :exclusions [com.taoensso/encore]]
                  [markdown-clj "0.9.99" :exclusions [com.keminglabs/cljx]]
                  [crypto-password "0.2.0"]
@@ -43,17 +41,20 @@
 
   :repl-options {:init-ns smeagol.repl}
   :jvm-opts ["-server"]
-  :plugins [[lein-ring "0.8.13" :exclusions [org.clojure/clojure]]
-            [lein-environ "1.0.0"]
+  :plugins [[lein-ancient "0.5.5" :exclusions [org.clojure/clojure org.clojure/data.xml]]
             [lein-bower "0.5.1"]
-            [lein-ancient "0.5.5" :exclusions [org.clojure/clojure org.clojure/data.xml]]
+            [lein-codox "0.10.3"]
+            [io.sarnowski/lein-docker "1.0.0"]
+            [lein-environ "1.0.0"]
             [lein-marginalia "0.7.1" :exclusions [org.clojure/clojure]]
-            [lein-codox "0.10.3"]]
+            [lein-ring "0.8.13" :exclusions [org.clojure/clojure]]]
   :bower-dependencies [[simplemde "1.11.2"]
                        ;; [vega-embed "3.0.0-beta.19"] vega-embed currently not loaded from Bower because of
                        ;; dependency conflict which will hopefully be resolved soon.
                        [vega-lite "2.0.0-beta.10"]
                        [mermaid "6.0.0"]]
+  :docker {:image-name "simonbrooke/smeagol"
+           :dockerfile "Dockerfile"}
   :ring {:handler smeagol.handler/app
          :init    smeagol.handler/init
          :destroy smeagol.handler/destroy}