Start Rails 6.0 development!!!

🎉🎉🎉
rails · Jan 30, 2018 · 1c383df324fdf0b68b3f54a649eb7d2a4f55bcb7 · 1c383df · composerinteralia · Jan 31, 2018
1 parent bec74e1
commit 1c383df324fdf0b68b3f54a649eb7d2a4f55bcb7
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -34,63 +34,63 @@ GIT
 PATH
   remote: .
   specs:
-    actioncable (5.2.0.beta2)
-      actionpack (= 5.2.0.beta2)
+    actioncable (6.0.0.alpha)
+      actionpack (= 6.0.0.alpha)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.0.beta2)
-      actionpack (= 5.2.0.beta2)
-      actionview (= 5.2.0.beta2)
-      activejob (= 5.2.0.beta2)
+    actionmailer (6.0.0.alpha)
+      actionpack (= 6.0.0.alpha)
+      actionview (= 6.0.0.alpha)
+      activejob (= 6.0.0.alpha)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.0.beta2)
-      actionview (= 5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
+    actionpack (6.0.0.alpha)
+      actionview (= 6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
+    actionview (6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
+    activejob (6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
       globalid (>= 0.3.6)
-    activemodel (5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
-    activerecord (5.2.0.beta2)
-      activemodel (= 5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
+    activemodel (6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
+    activerecord (6.0.0.alpha)
+      activemodel (= 6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
       arel (>= 9.0)
-    activestorage (5.2.0.beta2)
-      actionpack (= 5.2.0.beta2)
-      activerecord (= 5.2.0.beta2)
+    activestorage (6.0.0.alpha)
+      actionpack (= 6.0.0.alpha)
+      activerecord (= 6.0.0.alpha)
       marcel (~> 0.3.1)
-    activesupport (5.2.0.beta2)
+    activesupport (6.0.0.alpha)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    rails (5.2.0.beta2)
-      actioncable (= 5.2.0.beta2)
-      actionmailer (= 5.2.0.beta2)
-      actionpack (= 5.2.0.beta2)
-      actionview (= 5.2.0.beta2)
-      activejob (= 5.2.0.beta2)
-      activemodel (= 5.2.0.beta2)
-      activerecord (= 5.2.0.beta2)
-      activestorage (= 5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
+    rails (6.0.0.alpha)
+      actioncable (= 6.0.0.alpha)
+      actionmailer (= 6.0.0.alpha)
+      actionpack (= 6.0.0.alpha)
+      actionview (= 6.0.0.alpha)
+      activejob (= 6.0.0.alpha)
+      activemodel (= 6.0.0.alpha)
+      activerecord (= 6.0.0.alpha)
+      activestorage (= 6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
       bundler (>= 1.3.0)
-      railties (= 5.2.0.beta2)
+      railties (= 6.0.0.alpha)
       sprockets-rails (>= 2.0.0)
-    railties (5.2.0.beta2)
-      actionpack (= 5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
+    railties (6.0.0.alpha)
+      actionpack (= 6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -274,7 +274,7 @@ GEM
     hiredis (0.6.1-java)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (0.9.1)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
     io-like (0.3.0)
     jdbc-mysql (5.1.44)
@@ -333,8 +333,8 @@ GEM
     mysql2 (0.4.9)
     mysql2 (0.4.9-x64-mingw32)
     mysql2 (0.4.9-x86-mingw32)
-    nio4r (2.1.0)
-    nio4r (2.1.0-java)
+    nio4r (2.2.0)
+    nio4r (2.2.0-java)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
     nokogiri (1.8.1-java)
@@ -496,6 +496,8 @@ GEM
     websocket (1.2.4)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
+    websocket-driver (0.6.5-java)
+      websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.1.0)
       nokogiri (~> 1.3)

diff --git a/RAILS_VERSION b/RAILS_VERSION
@@ -1 +1 @@
-5.2.0.beta2
+6.0.0.alpha
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
@@ -1,34 +1,3 @@
-## Rails 5.2.0.beta2 (November 28, 2017) ##
 
-*   No changes.
 
-
-## Rails 5.2.0.beta1 (November 27, 2017) ##
-
-*   Removed deprecated evented redis adapter.
-
-    *Rafael Mendonça França*
-
-*   Support redis-rb 4.0.
-
-    *Jeremy Daer*
-
-*   Hash long stream identifiers when using PostgreSQL adapter.
-
-    PostgreSQL has a limit on identifiers length (63 chars, [docs](https://www.postgresql.org/docs/current/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS)).
-    Provided fix minifies identifiers longer than 63 chars by hashing them with SHA1.
-
-    Fixes #28751.
-
-    *Vladimir Dementyev*
-
-*   Action Cable's `redis` adapter allows for other common redis-rb options (`host`, `port`, `db`, `password`) in cable.yml.
-
-    Previously, it accepts only a [redis:// url](https://www.iana.org/assignments/uri-schemes/prov/redis) as an option.
-    While we can add all of these options to the `url` itself, it is not explicitly documented. This alternative setup
-    is shown as the first example in the [Redis rubygem](https://github.com/redis/redis-rb#getting-started), which
-    makes this set of options as sensible as using just the `url`.
-
-    *Marc Rendl Ignacio*
-
-Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/actioncable/CHANGELOG.md) for previous changes.
+Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/actioncable/CHANGELOG.md) for previous changes.
diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb
@@ -7,10 +7,10 @@ def self.gem_version
   end
 
   module VERSION
-    MAJOR = 5
-    MINOR = 2
+    MAJOR = 6
+    MINOR = 0
     TINY  = 0
-    PRE   = "beta2"
+    PRE   = "alpha"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/actioncable/package.json b/actioncable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "actioncable",
-  "version": "5.2.0-beta2",
+  "version": "6.0.0-alpha",
   "description": "WebSocket framework for Ruby on Rails.",
   "main": "lib/assets/compiled/action_cable.js",
   "files": [

diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
@@ -1,33 +1,3 @@
-*   Bring back proc with arity of 1 in `ActionMailer::Base.default` proc
-    since it was supported in Rails 5.0 but not deprecated.
 
-    *Jimmy Bourassa*
 
-
-## Rails 5.2.0.beta2 (November 28, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.2.0.beta1 (November 27, 2017) ##
-
-*   Add `assert_enqueued_email_with` test helper.
-
-        assert_enqueued_email_with ContactMailer, :welcome do
-          ContactMailer.welcome.deliver_later
-        end
-
-    *Mikkel Malmberg*
-
-*   Allow Action Mailer classes to configure their delivery job.
-
-        class MyMailer < ApplicationMailer
-          self.delivery_job = MyCustomDeliveryJob
-
-          ...
-        end
-
-    *Matthew Mongeau*
-
-
-Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/actionmailer/CHANGELOG.md) for previous changes.
diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
@@ -7,10 +7,10 @@ def self.gem_version
   end
 
   module VERSION
-    MAJOR = 5
-    MINOR = 2
+    MAJOR = 6
+    MINOR = 0
     TINY  = 0
-    PRE   = "beta2"
+    PRE   = "alpha"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end