aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-10-25 19:39:59 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-10-25 19:39:59 -0700
commit91c5af413bac0f34a582128ea12b10850194e023 (patch)
tree55c4db7a94b3fd958993db774bfc14a08f783ac7
parentca3b42981547aab9da4ee2e11b9fa3d9bb805169 (diff)
parentcadff7b73d3c992a06e0c7b7bd8220a6313ee1b7 (diff)
downloadrails-91c5af413bac0f34a582128ea12b10850194e023.tar.gz
rails-91c5af413bac0f34a582128ea12b10850194e023.tar.bz2
rails-91c5af413bac0f34a582128ea12b10850194e023.zip
Merge pull request #8031 from gbchaosmaster/redcarpet-2.2.2
Update redcarpet dependency
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 6e0f43c526..a1c14b059e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gemspec
gem 'arel', github: 'rails/arel', branch: 'master'
-gem 'mocha', '>= 0.11.2', :require => false
+gem 'mocha', '>= 0.11.2', require: false
gem 'rack-test', github: 'brynary/rack-test'
gem 'rack-cache', '~> 1.2'
gem 'bcrypt-ruby', '~> 3.0.0'
@@ -28,7 +28,7 @@ group :doc do
# for some weeks unapplied. As a temporary solution
# this is our own fork with the fix.
gem 'sdoc', github: 'fxn/sdoc'
- gem 'redcarpet', '~> 2.1.1', :platforms => :ruby
+ gem 'redcarpet', '~> 2.2.2', platforms: :ruby
gem 'w3c_validators'
end