From 6bec3d67ed228d2be069515b553e0f0a91fced0f Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Sun, 17 May 2015 13:52:01 +0200
Subject: [PATCH] Update markdown-it-sanitizer and markdown-it-for-inline

closes #5965
---
 Changelog.md | 1 +
 Gemfile      | 4 ++--
 Gemfile.lock | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3e7c04323..d07a01468 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -28,6 +28,7 @@
 * Fix missing localization of inactive user removal warning emails [#5950](https://github.com/diaspora/diaspora/issues/5950)
 * Fix fetching for public post while Webfingering [#5958](https://github.com/diaspora/diaspora/pull/5958)
 * Handle empty searchable in HCard gracefully [#5962](https://github.com/diaspora/diaspora/pull/5962)
+* Fix a freeze in new post parsing [#5965](https://github.com/diaspora/diaspora/pull/5965)
 
 ## Features
 * Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843)
diff --git a/Gemfile b/Gemfile
index 86df813c4..612da3f98 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,8 +96,8 @@ source "https://rails-assets.org" do
   gem "rails-assets-markdown-it",                         "4.2.1"
   gem "rails-assets-markdown-it-hashtag",                 "0.3.0"
   gem "rails-assets-markdown-it-diaspora-mention",        "0.3.0"
-  gem "rails-assets-markdown-it-sanitizer",               "0.3.0"
-  gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.0"
+  gem "rails-assets-markdown-it-sanitizer",               "0.3.1"
+  gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
   gem "rails-assets-markdown-it-sub",                     "1.0.0"
   gem "rails-assets-markdown-it-sup",                     "1.0.0"
   gem "rails-assets-highlightjs",                         "8.5.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index b34794e96..61877dc41 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -519,11 +519,11 @@ GEM
       rails-assets-jquery (>= 1.6)
     rails-assets-jquery.slimscroll (1.3.3)
       rails-assets-jquery (>= 1.7)
-    rails-assets-markdown-it--markdown-it-for-inline (0.1.0)
+    rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
     rails-assets-markdown-it (4.2.1)
     rails-assets-markdown-it-diaspora-mention (0.3.0)
     rails-assets-markdown-it-hashtag (0.3.0)
-    rails-assets-markdown-it-sanitizer (0.3.0)
+    rails-assets-markdown-it-sanitizer (0.3.1)
     rails-assets-markdown-it-sub (1.0.0)
     rails-assets-markdown-it-sup (1.0.0)
     rails-assets-perfect-scrollbar (0.5.9)
@@ -790,10 +790,10 @@ DEPENDENCIES
   rails-assets-jquery-simulate-ext (= 1.3.0)!
   rails-assets-jquery-textchange (= 0.2.3)!
   rails-assets-markdown-it (= 4.2.1)!
-  rails-assets-markdown-it--markdown-it-for-inline (= 0.1.0)!
+  rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
   rails-assets-markdown-it-diaspora-mention (= 0.3.0)!
   rails-assets-markdown-it-hashtag (= 0.3.0)!
-  rails-assets-markdown-it-sanitizer (= 0.3.0)!
+  rails-assets-markdown-it-sanitizer (= 0.3.1)!
   rails-assets-markdown-it-sub (= 1.0.0)!
   rails-assets-markdown-it-sup (= 1.0.0)!
   rails-assets-perfect-scrollbar (= 0.5.9)!