Aaron Patterson 6dfab475ca Merge branch '5-0-beta-sec' ... * 5-0-beta-sec: bumping version fix version update task to deal with .beta1.1 Eliminate instance level writers for class accessors allow :file to be outside rails root, but anything else must be inside the rails view directory Don't short-circuit reject_if proc stop caching mime types globally use secure string comparisons for basic auth username / password		2016-01-25 11:25:11 -08:00
..
active_model	Merge branch '5-0-beta-sec'	2016-01-25 11:25:11 -08:00
active_model.rb	Update copyright notices to 2016 [ci skip]	2015-12-31 18:27:19 +02:00