From 2a05b6e9071f03bb9931babec504279292ec20f8 Mon Sep 17 00:00:00 2001
From: Michael Rose <est.michael@gmail.com>
Date: Tue, 31 May 2016 12:37:17 -0400
Subject: [PATCH 1/4] Update CHANGELOG

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6fb8667..ebbd9262 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## [3.2.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.1)
+
+### Bug Fixes
+
+- Remove need for "double tapping" masthead menu links on iOS devices. [#315](https://github.com/mmistakes/minimal-mistakes/issues/315)
+
+### Maintenance
+
+- Add `ISSUE_TEMPLATE.md` for improve issue submission process.
+
 ## [3.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.0)
 
 ### Bug Fixes

From 9b833feb7d3c7596cab545526b838c60c478b6bc Mon Sep 17 00:00:00 2001
From: Michael Rose <est.michael@gmail.com>
Date: Wed, 1 Jun 2016 21:52:26 -0400
Subject: [PATCH 2/4] Update CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27164cc6..da4c4aff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### Enhancement
 
-- Add support for image captions in Magnific Popup overlays via the [`gallery` helper](https://github.com/mmistakes/minimal-mistakes/issues/334)
+- Add support for image captions in Magnific Popup overlays via the [`gallery`](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#gallery) helper [#334](https://github.com/mmistakes/minimal-mistakes/issues/334)
 
 ## [3.2.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.1)
 

From f6f7d0cd97d17e17ce628f7914d6f3c9c18827fa Mon Sep 17 00:00:00 2001
From: Robert Riemann <robert@riemann.cc>
Date: Fri, 3 Jun 2016 00:30:32 +0200
Subject: [PATCH 3/4] javascript to embed comments from discourse forum

The comment system can be changed to embed topics from the Discourse
forum software: http://discourse.org/

More details: https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963
---
 _config.yml                                 |  4 +++-
 _includes/comments-providers/discourse.html | 13 +++++++++++++
 _includes/comments-providers/scripts.html   |  2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 _includes/comments-providers/discourse.html

diff --git a/_config.yml b/_config.yml
index d3932ea6..01346491 100644
--- a/_config.yml
+++ b/_config.yml
@@ -18,9 +18,11 @@ teaser                   : # filename of teaser fallback teaser image placed in
 # breadcrumbs            : false # true, false (default)
 words_per_minute         : 200
 comments:
-  provider               : # false (default), "disqus", "facebook", "google-plus", custom"
+  provider               : # false (default), "disqus", "discourse", "facebook", "google-plus", custom"
   disqus:
     shortname            : # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname-
+  discourse:
+    server               : # https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963 , e.g.: meta.discourse.org
   facebook:
     # https://developers.facebook.com/docs/plugins/comments
     appid                :
diff --git a/_includes/comments-providers/discourse.html b/_includes/comments-providers/discourse.html
new file mode 100644
index 00000000..1dbcaced
--- /dev/null
+++ b/_includes/comments-providers/discourse.html
@@ -0,0 +1,13 @@
+{% if site.comments.discourse.server %}
+{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
+<script type="text/javascript">
+    DiscourseEmbed = { discourseUrl: '//{{ site.comments.discourse.server }}/',
+                       discourseEmbedUrl: '{{ canonical }}' };
+   (function () {
+     var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+     d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+     (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+   })();
+</script>
+<noscript>Please enable JavaScript to view the comments powered by [Discourse](http://forum.beta-europe.org/c/beta/website).</a></noscript>
+{% endif %}
diff --git a/_includes/comments-providers/scripts.html b/_includes/comments-providers/scripts.html
index df699fc5..0da90c5d 100644
--- a/_includes/comments-providers/scripts.html
+++ b/_includes/comments-providers/scripts.html
@@ -3,6 +3,8 @@
 {% case site.comments.provider %}
 {% when "disqus" %}
   {% include /comments-providers/disqus.html %}
+{% when "discourse" %}
+  {% include /comments-providers/discourse.html %}
 {% when "facebook" %}
   {% include /comments-providers/facebook.html %}
 {% when "google-plus" %}

From e186ee3650874af667cb6f9cc1bc88281a399150 Mon Sep 17 00:00:00 2001
From: Robert Riemann <robert@riemann.cc>
Date: Fri, 3 Jun 2016 10:57:52 +0200
Subject: [PATCH 4/4] take into account an optional basepath

---
 _includes/comments-providers/discourse.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/_includes/comments-providers/discourse.html b/_includes/comments-providers/discourse.html
index 1dbcaced..de2d2d58 100644
--- a/_includes/comments-providers/discourse.html
+++ b/_includes/comments-providers/discourse.html
@@ -1,5 +1,6 @@
 {% if site.comments.discourse.server %}
-{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
+{% include base_path %}
+{% capture canonical %}{{ base_path }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
 <script type="text/javascript">
     DiscourseEmbed = { discourseUrl: '//{{ site.comments.discourse.server }}/',
                        discourseEmbedUrl: '{{ canonical }}' };