aboutsummaryrefslogtreecommitdiffstats
path: root/activejob
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2019-01-18 15:42:12 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2019-01-18 15:42:12 -0500
commit5a0230c67f852fb21173f99647e76336897446c1 (patch)
tree229177305a322ef5edbd9b0526976ec8f0c76391 /activejob
parentea83132e0eeb6988f9211d5b5cbe4b99f2b9982e (diff)
downloadrails-5a0230c67f852fb21173f99647e76336897446c1.tar.gz
rails-5a0230c67f852fb21173f99647e76336897446c1.tar.bz2
rails-5a0230c67f852fb21173f99647e76336897446c1.zip
Preparing for 6.0.0.beta1 release
Diffstat (limited to 'activejob')
-rw-r--r--activejob/CHANGELOG.md2
-rw-r--r--activejob/lib/active_job/gem_version.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
index 31253855d7..0ed937f4cc 100644
--- a/activejob/CHANGELOG.md
+++ b/activejob/CHANGELOG.md
@@ -1,3 +1,5 @@
+## Rails 6.0.0.beta1 (January 18, 2019) ##
+
* Return false instead of the job instance when `enqueue` is aborted.
This will be the behavior in Rails 6.1 but it can be controlled now with
diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb
index 770f70dc5e..2b894397e3 100644
--- a/activejob/lib/active_job/gem_version.rb
+++ b/activejob/lib/active_job/gem_version.rb
@@ -10,7 +10,7 @@ module ActiveJob
MAJOR = 6
MINOR = 0
TINY = 0
- PRE = "alpha"
+ PRE = "beta1"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end