diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-01-25 11:23:48 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-01-25 11:23:48 -0800 |
| commit | 3b4398bb605cc7b6f475bf76c19aa0702700a199 (patch) | |
| tree | 13285c577d9b6aff2fde072a2030b0468a775423 /activemodel | |
| parent | d25e79fba6090d56769da6f0fbb401bb1afdb28a (diff) | |
| parent | 8d86637fb64ae8ae81ab71a286ddba02cc3144a4 (diff) | |
| download | rails-3b4398bb605cc7b6f475bf76c19aa0702700a199.tar.gz rails-3b4398bb605cc7b6f475bf76c19aa0702700a199.tar.bz2 rails-3b4398bb605cc7b6f475bf76c19aa0702700a199.zip | |
Merge branch '3-2-sec' into 3-2-stable
* 3-2-sec:
bumping version
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
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index a44ecbdb41..e0cc92f609 100644 --- a/activemodel/lib/active_model/version.rb +++ b/activemodel/lib/active_model/version.rb @@ -3,7 +3,7 @@ module ActiveModel MAJOR = 3 MINOR = 2 TINY = 22 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |