ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bump authlogic for official rails4 support 

Change-Id: I41bb4316c2336496194a994cc1cc62b2a5c94787
Reviewed-on: https://gerrit.instructure.com/42325
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Paul Hinze <paulh@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2014-10-06 20:29:33 -06:00
parent e79632e8a6
commit 0b015901fb
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.d/other_stuff.rb
View File

@ -16,7 +16,7 @@ end
gem 'encrypted_cookie_store-instructure', '1.1.8', :require => 'encrypted_cookie_store' gem 'encrypted_cookie_store-instructure', '1.1.8', :require => 'encrypted_cookie_store'
gem 'active_model_serializers', '0.9.0alpha1', gem 'active_model_serializers', '0.9.0alpha1',
:github => 'rails-api/active_model_serializers', :ref => '61882e1e4127facfe92e49057aec71edbe981829' :github => 'rails-api/active_model_serializers', :ref => '61882e1e4127facfe92e49057aec71edbe981829'
gem 'authlogic', '3.3.0' gem 'authlogic', '3.4.2'
gem 'active_model-better_errors', '1.6.7', :require => 'active_model/better_errors' gem 'active_model-better_errors', '1.6.7', :require => 'active_model/better_errors'
gem 'dynamic_form', '1.1.4' gem 'dynamic_form', '1.1.4'
gem 'rails-patch-json-encode', '0.0.1' gem 'rails-patch-json-encode', '0.0.1'

1
app/models/pseudonym.rb
View File

@ -67,6 +67,7 @@ class Pseudonym < ActiveRecord::Base
config.perishable_token_valid_for = 30.minutes config.perishable_token_valid_for = 30.minutes
config.validates_length_of_login_field_options = {:within => 1..MAX_UNIQUE_ID_LENGTH} config.validates_length_of_login_field_options = {:within => 1..MAX_UNIQUE_ID_LENGTH}
config.validates_uniqueness_of_login_field_options = { :case_sensitive => false, :scope => [:account_id, :workflow_state], :if => lambda { |p| (p.unique_id_changed? || p.workflow_state_changed?) && p.active? } } config.validates_uniqueness_of_login_field_options = { :case_sensitive => false, :scope => [:account_id, :workflow_state], :if => lambda { |p| (p.unique_id_changed? || p.workflow_state_changed?) && p.active? } }
config.crypto_provider = Authlogic::CryptoProviders::Sha512
end end
attr_writer :require_password attr_writer :require_password