aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-07-02 10:25:18 +0200
committerJosé Valim <jose.valim@gmail.com>2009-07-02 10:25:18 +0200
commit1c265da1db934ffab0a5151dc7beeed3ef1bbabb (patch)
treee3e2af724e0fe70b9bceb09a26a179fadf76b992 /activemodel
parent4739f0ff5d5c013eb33aed7f371a3a91d3fca292 (diff)
parent8bb510f6c1e235f5fb1cf9e79af759a429a497b0 (diff)
downloadrails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.tar.gz
rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.tar.bz2
rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/test/cases/helper.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index f023109a60..3c0bd15236 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -10,8 +10,6 @@ ActiveSupport::Deprecation.debug = true
require 'rubygems'
require 'test/unit'
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
begin
require 'ruby-debug'