aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Davis <ryand-ruby@zenspider.com>2013-05-08 16:44:05 -0700
committerRyan Davis <ryand-ruby@zenspider.com>2013-05-08 16:44:05 -0700
commit0809c09c342d749ca07100cc04ff1d336a68b1fb (patch)
tree29745d50c813e57630b7031faebbe6e2c18e5730
parent3073c531983de243219fb55be93fbcebfdd9c44e (diff)
downloadrails-0809c09c342d749ca07100cc04ff1d336a68b1fb.tar.gz
rails-0809c09c342d749ca07100cc04ff1d336a68b1fb.tar.bz2
rails-0809c09c342d749ca07100cc04ff1d336a68b1fb.zip
tweak dependencies
-rw-r--r--Gemfile2
-rw-r--r--activesupport/activesupport.gemspec2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 661ef25a57..958249a7c9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
gemspec
-gem 'mocha', '~> 0.13.0', require: false
+gem 'mocha', git: 'https://github.com/freerange/mocha', require: false
gem 'rack-cache', '~> 1.2'
gem 'bcrypt-ruby', '~> 3.0.0'
gem 'jquery-rails', '~> 2.2.0'
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index b46a331f6a..b085d89adf 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
s.add_dependency('i18n', '~> 0.6', '>= 0.6.4')
s.add_dependency 'multi_json', '~> 1.3'
s.add_dependency 'tzinfo', '~> 0.3.37'
- s.add_dependency 'minitest', '~> 4.2'
+ s.add_dependency 'minitest', '~> 5.0'
s.add_dependency 'thread_safe','~> 0.1'
end