aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-09-03 10:12:39 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-09-03 10:12:39 -0700
commit867c83060398c5f2fa63df35a3d31b49549b405e (patch)
treeb8569f22cb2510dc6ab64c0181aaf7afc8fb7a70
parentd50c0acc95d9ac9b258594c7d68e1eeef9b6d41e (diff)
parentbf4117a8b1d29662902eedd4dbfc810d4b629395 (diff)
downloadrails-867c83060398c5f2fa63df35a3d31b49549b405e.tar.gz
rails-867c83060398c5f2fa63df35a3d31b49549b405e.tar.bz2
rails-867c83060398c5f2fa63df35a3d31b49549b405e.zip
Merge pull request #2824 from arunagw/bcrypt_fix
Need to add here to pass the test
-rw-r--r--activerecord/test/cases/base_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 1e647b5970..8b95eb958b 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -24,6 +24,7 @@ require 'models/joke'
require 'models/bulb'
require 'rexml/document'
require 'active_support/core_ext/exception'
+require 'bcrypt'
class Category < ActiveRecord::Base; end
class Categorization < ActiveRecord::Base; end