Merge branch 'master' of https://github.com/lifo/docrails

Conflicts:
	activerecord/lib/active_record/callbacks.rb

1 files changed, 5 insertions, 5 deletions

diff --git a/Gemfile b/Gemfile
index 3b77524077..6e0f43c526 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,9 +6,9 @@ gem 'arel', github: 'rails/arel', branch: 'master'
 
 gem 'mocha', '>= 0.11.2', :require => false
 gem 'rack-test', github: 'brynary/rack-test'
-gem 'rack-cache', "~> 1.2"
+gem 'rack-cache', '~> 1.2'
 gem 'bcrypt-ruby', '~> 3.0.0'
-gem 'jquery-rails'
+gem 'jquery-rails', '~> 2.1.4', github: 'rails/jquery-rails'
 gem 'turbolinks'
 gem 'coffee-rails', github: 'rails/coffee-rails'
 
@@ -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'
+  gem 'redcarpet', '~> 2.1.1', :platforms => :ruby
   gem 'w3c_validators'
 end
 
@@ -41,8 +41,8 @@ instance_eval File.read local_gemfile if File.exists? local_gemfile
 
 platforms :mri do
   group :test do
-    gem 'ruby-prof', '~> 0.11.2'
-    gem 'debugger' if !ENV['TRAVIS'] && RUBY_VERSION < "2.0"
+    gem 'ruby-prof', '~> 0.11.2' if RUBY_VERSION < '2.0'
+    gem 'debugger' if !ENV['TRAVIS'] && RUBY_VERSION < '2.0' && RUBY_PATCHLEVEL < 286
   end
 end