Merge pull request #2951 from jekyll/fix-rouge

jekyll.gemspec

@@ -62,5 +62,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('activesupport', '~> 3.2.13')
   s.add_development_dependency('jekyll_test_plugin')
   s.add_development_dependency('jekyll_test_plugin_malicious')
-  s.add_development_dependency('rouge', '~> 1.3')
+  s.add_development_dependency('rouge', '~> 1.7')
 end

lib/jekyll/converters/markdown/redcarpet_parser.rb

@@ -48,8 +48,8 @@ module Jekyll
           end
 
           protected
-          def rouge_formatter(opts = {})
-            Rouge::Formatters::HTML.new(opts.merge(wrap: false))
+          def rouge_formatter(lexer)
+            Rouge::Formatters::HTML.new(:wrap => false)
           end
         end