Merge branch 'stable' into develop

Gemfile

@@ -103,7 +103,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"
   gem "rails-assets-typeahead.js",                        "0.11.1"
 
   # jQuery plugins

Gemfile.lock

@@ -571,7 +571,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)
@@ -888,7 +888,7 @@ DEPENDENCIES
   rails-assets-autosize (= 3.0.14)!
   rails-assets-blueimp-gallery (= 2.16.0)!
   rails-assets-diaspora_jsxc (~> 0.1.5.develop)!
-  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)!
@@ -942,4 +942,4 @@ DEPENDENCIES
   will_paginate (= 3.0.7)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

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\">");
     });