aboutsummaryrefslogtreecommitdiffstats
path: root/activejob
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2016-01-25 11:25:11 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2016-01-25 11:25:11 -0800
commit6dfab475ca230dfcad7a603483431c8e7a8f908e (patch)
tree69ca8ade43b0e39e1d8cffa68390e9052e589acf /activejob
parent14e92bac1a4c199e5e8936c6bdc64420293ea6d1 (diff)
parent908c011395cc9e3ea1bb195f9d1bd30a9d9df98f (diff)
downloadrails-6dfab475ca230dfcad7a603483431c8e7a8f908e.tar.gz
rails-6dfab475ca230dfcad7a603483431c8e7a8f908e.tar.bz2
rails-6dfab475ca230dfcad7a603483431c8e7a8f908e.zip
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
Diffstat (limited to 'activejob')
-rw-r--r--activejob/lib/active_job/gem_version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb
index 35356405b5..0bdeca76a8 100644
--- a/activejob/lib/active_job/gem_version.rb
+++ b/activejob/lib/active_job/gem_version.rb
@@ -8,7 +8,7 @@ module ActiveJob
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1"
+ PRE = "beta1.1"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end