From 78df0f5158588ec6d5c92c8b57cb3c6cb446fadd Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Mon, 28 Dec 2015 15:56:50 +0100
Subject: [PATCH] Update highlightjs
---
Gemfile | 2 +-
Gemfile.lock | 6 +++---
spec/javascripts/app/helpers/text_formatter_spec.js | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Gemfile b/Gemfile
index bd3028901c..0d1a7c3865 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.9.1"
+ gem "rails-assets-highlightjs", "9.0.0"
# jQuery plugins
diff --git a/Gemfile.lock b/Gemfile.lock
index 5db0d5b7ed..0a72472759 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -539,7 +539,7 @@ GEM
rails-assets-jquery.slimscroll (~> 1.3.6)
rails-assets-jquery.ui (~> 1.11.4)
rails-assets-favico.js (0.3.10)
- rails-assets-highlightjs (8.9.1)
+ rails-assets-highlightjs (9.0.0)
rails-assets-jakobmattsson--jquery-elastic (1.6.11)
rails-assets-jquery (>= 1.2.6)
rails-assets-jasmine (2.3.4)
@@ -835,7 +835,7 @@ DEPENDENCIES
rack-ssl (= 1.4.1)
rails (= 4.2.5)
rails-assets-diaspora_jsxc (~> 0.1.4)!
- rails-assets-highlightjs (= 8.9.1)!
+ rails-assets-highlightjs (= 9.0.0)!
rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
rails-assets-jasmine-ajax (= 3.2.0)!
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
@@ -888,4 +888,4 @@ DEPENDENCIES
will_paginate (= 3.0.7)
BUNDLED WITH
- 1.10.6
+ 1.11.2
diff --git a/spec/javascripts/app/helpers/text_formatter_spec.js b/spec/javascripts/app/helpers/text_formatter_spec.js
index 04c18a9f49..e0b72adcb9 100644
--- a/spec/javascripts/app/helpers/text_formatter_spec.js
+++ b/spec/javascripts/app/helpers/text_formatter_spec.js
@@ -97,7 +97,7 @@ describe("app.helpers.textFormatter", function(){
it("works with markdown", function(){
var code = "```markdown\n# header\n**strong**\n```";
- expect(this.formatter(code)).toContain("<span class=\"hljs-header\">");
+ expect(this.formatter(code)).toContain("<span class=\"hljs-section\">");
expect(this.formatter(code)).toContain("<span class=\"hljs-strong\">");
});
--
GitLab