Permalink
Browse files

upgrade crypto method for user pass

  • Loading branch information...
1 parent 74444c6 commit a9acbf455c4f0c990e4d4b7adbb940267c0c58ac @bborn committed Jun 8, 2012
Showing with 11 additions and 3 deletions.
  1. +3 −0 CHANGELOG
  2. +2 −1 app/models/user.rb
  3. +1 −1 app/views/users/_user.html.haml
  4. +5 −1 config/routes.rb
View
@@ -4,6 +4,9 @@
* add back searching to users index
* swap jquery for prototype
+
+* Upgrade to bcrybt crypto method
+
=2.0.0.beta4
* Replace white_list plugin with Sanitize gem (white_list.rb initizlizer format has changed)
* Upgrade to Rails 3.2
View
@@ -15,7 +15,8 @@ class User < ActiveRecord::Base
FEMALE = 'F'
acts_as_authentic do |c|
- c.crypto_provider = CommunityEngineSha1CryptoMethod
+ c.transition_from_crypto_providers = CommunityEngineSha1CryptoMethod
+ c.crypto_provider = Authlogic::CryptoProviders::BCrypt
c.validates_length_of_password_field_options = { :within => 6..20, :if => :password_required? }
c.validates_length_of_password_confirmation_field_options = { :within => 6..20, :if => :password_required? }
@@ -28,4 +28,4 @@
- if current_user && current_user.admin?
%br
- = link_to( :assume_id.l, assume_user_path(user) )
+ = link_to( :assume_id.l, assume_user_path(user), :method => :post )
View
@@ -220,7 +220,11 @@
end
end
- resources :comments
+ resources :comments do
+ member do
+ get :unsubscribe
+ end
+ end
resources :photo_manager
resources :albums do

0 comments on commit a9acbf4

Please sign in to comment.