aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2014-05-13 23:30:33 +0200
committerRobin Dupret <robin.dupret@gmail.com>2014-05-14 19:52:47 +0200
commitad3628b3116553cc02c354fb5c552ec103de52dd (patch)
treeea4586479f955c53dbd2b61aa365c52270e66ead
parent567aa5440e3030161cb9dd0864909f1ccce60f72 (diff)
downloadrails-ad3628b3116553cc02c354fb5c552ec103de52dd.tar.gz
rails-ad3628b3116553cc02c354fb5c552ec103de52dd.tar.bz2
rails-ad3628b3116553cc02c354fb5c552ec103de52dd.zip
Update Redcarpet to 3.1.2
This version fixes an API breakage between 3.0 and 3.1 ; the header method's arity should not have changed. [ci skip]
-rw-r--r--Gemfile2
-rw-r--r--guides/rails_guides.rb4
-rw-r--r--guides/rails_guides/markdown/renderer.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 0e7c6dc755..57b8bfca1e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem 'uglifier', '>= 1.3.0', require: false
group :doc do
gem 'sdoc', '~> 0.4.0'
- gem 'redcarpet', '~> 3.1.0', platforms: :ruby
+ gem 'redcarpet', '~> 3.1.2', platforms: :ruby
gem 'w3c_validators'
gem 'kindlerb'
end
diff --git a/guides/rails_guides.rb b/guides/rails_guides.rb
index 1bdeef2947..9d1d5567f6 100644
--- a/guides/rails_guides.rb
+++ b/guides/rails_guides.rb
@@ -24,11 +24,11 @@ begin
require 'redcarpet'
rescue LoadError
# This can happen if doc:guides is executed in an application.
- $stderr.puts('Generating guides requires Redcarpet 3.1.0+.')
+ $stderr.puts('Generating guides requires Redcarpet 3.1.2+.')
$stderr.puts(<<ERROR) if bundler?
Please add
- gem 'redcarpet', '~> 3.1.0'
+ gem 'redcarpet', '~> 3.1.2'
to the Gemfile, run
diff --git a/guides/rails_guides/markdown/renderer.rb b/guides/rails_guides/markdown/renderer.rb
index 3791ed6fd5..2eb7ca17a3 100644
--- a/guides/rails_guides/markdown/renderer.rb
+++ b/guides/rails_guides/markdown/renderer.rb
@@ -15,7 +15,7 @@ module RailsGuides
HTML
end
- def header(text, header_level, anchor)
+ def header(text, header_level)
# Always increase the heading level by, so we can use h1, h2 heading in the document
header_level += 1