From c3a44dcce1088685d5a472fc8120fa6d305d502e Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 22 Nov 2015 14:25:07 +0100 Subject: [PATCH 1/3] Update markdown-it --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index eee01c74e..b717e127c 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,7 @@ gem "js-routes", "1.1.2" source "https://rails-assets.org" do gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails - gem "rails-assets-markdown-it", "5.0.0" + gem "rails-assets-markdown-it", "5.0.2" gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-diaspora-mention", "0.4.0" gem "rails-assets-markdown-it-sanitizer", "0.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 162302bd5..fcda433aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -557,7 +557,7 @@ GEM rails-assets-jquery.ui (1.11.4) rails-assets-jquery (>= 1.6) rails-assets-markdown-it--markdown-it-for-inline (0.1.1) - rails-assets-markdown-it (5.0.0) + rails-assets-markdown-it (5.0.2) rails-assets-markdown-it-diaspora-mention (0.4.0) rails-assets-markdown-it-hashtag (0.4.0) rails-assets-markdown-it-sanitizer (0.4.0) @@ -839,7 +839,7 @@ DEPENDENCIES rails-assets-jquery (= 1.11.2)! rails-assets-jquery-placeholder (= 2.1.3)! rails-assets-jquery-textchange (= 0.2.3)! - rails-assets-markdown-it (= 5.0.0)! + rails-assets-markdown-it (= 5.0.2)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it-diaspora-mention (= 0.4.0)! rails-assets-markdown-it-hashtag (= 0.4.0)! From b8756cb16fbbb1f05c088a5ef8fd26c4d53422c6 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 22 Nov 2015 14:26:35 +0100 Subject: [PATCH 2/3] Update markdown-it-sanitizer --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b717e127c..834004a34 100644 --- a/Gemfile +++ b/Gemfile @@ -96,7 +96,7 @@ source "https://rails-assets.org" do gem "rails-assets-markdown-it", "5.0.2" gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-diaspora-mention", "0.4.0" - gem "rails-assets-markdown-it-sanitizer", "0.4.0" + gem "rails-assets-markdown-it-sanitizer", "0.4.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" diff --git a/Gemfile.lock b/Gemfile.lock index fcda433aa..d7fb6e7b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -560,7 +560,7 @@ GEM rails-assets-markdown-it (5.0.2) rails-assets-markdown-it-diaspora-mention (0.4.0) rails-assets-markdown-it-hashtag (0.4.0) - rails-assets-markdown-it-sanitizer (0.4.0) + rails-assets-markdown-it-sanitizer (0.4.1) rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sup (1.0.0) rails-assets-perfect-scrollbar (0.6.7) @@ -843,7 +843,7 @@ DEPENDENCIES rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it-diaspora-mention (= 0.4.0)! rails-assets-markdown-it-hashtag (= 0.4.0)! - rails-assets-markdown-it-sanitizer (= 0.4.0)! + rails-assets-markdown-it-sanitizer (= 0.4.1)! rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-perfect-scrollbar (= 0.6.7)! From 98eb1034465d5d8c6d6281d3e920169407ee5933 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 22 Nov 2015 14:32:04 +0100 Subject: [PATCH 3/3] Update highlight.js closes #6558 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 834004a34..1f84de849 100644 --- a/Gemfile +++ b/Gemfile @@ -100,7 +100,7 @@ source "https://rails-assets.org" do 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.8.0" + gem "rails-assets-highlightjs", "8.9.1" # jQuery plugins diff --git a/Gemfile.lock b/Gemfile.lock index d7fb6e7b8..4f2e0f4b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -538,7 +538,7 @@ GEM rails-assets-jquery.slimscroll (= 1.3.6) rails-assets-jquery.ui (= 1.11.4) rails-assets-favico.js (0.3.9) - rails-assets-highlightjs (8.8.0) + rails-assets-highlightjs (8.9.1) rails-assets-jakobmattsson--jquery-elastic (1.6.11) rails-assets-jquery (>= 1.2.6) rails-assets-jasmine (2.3.4) @@ -832,7 +832,7 @@ DEPENDENCIES rack-ssl (= 1.4.1) rails (= 4.2.5) rails-assets-diaspora_jsxc (~> 0.1.4.alpha, < 0.1.4.develop)! - rails-assets-highlightjs (= 8.8.0)! + rails-assets-highlightjs (= 8.9.1)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!