diff options
Diffstat (limited to 'activemodel')
-rw-r--r-- | activemodel/activemodel.gemspec | 1 | ||||
-rw-r--r-- | activemodel/lib/active_model/secure_password.rb | 2 | ||||
-rw-r--r-- | activemodel/lib/active_model/version.rb | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec index 22c0a6224f..30e308d8ad 100644 --- a/activemodel/activemodel.gemspec +++ b/activemodel/activemodel.gemspec @@ -18,6 +18,5 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', version) s.add_dependency('builder', '~> 3.0.0') - s.add_dependency('i18n', '~> 0.6.0beta1') s.add_dependency('bcrypt-ruby', '~> 2.1.4') end diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb index ee94ad66cf..63380d6ffd 100644 --- a/activemodel/lib/active_model/secure_password.rb +++ b/activemodel/lib/active_model/secure_password.rb @@ -30,7 +30,7 @@ module ActiveModel # User.find_by_name("david").try(:authenticate, "notright") # => nil # User.find_by_name("david").try(:authenticate, "mUc3m00RsqyRe") # => user def has_secure_password - attr_reader :password + attr_reader :password validates_confirmation_of :password validates_presence_of :password_digest diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index 68c138da84..09684ac4df 100644 --- a/activemodel/lib/active_model/version.rb +++ b/activemodel/lib/active_model/version.rb @@ -3,7 +3,7 @@ module ActiveModel MAJOR = 3 MINOR = 1 TINY = 0 - PRE = "beta1" + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |