From 9834be65655e8552d25633b7376ab0654a23875d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 24 Apr 2019 15:57:14 -0400
Subject: Start Rails 6.1 development

---
 railties/lib/rails/application/configuration.rb | 2 ++
 railties/lib/rails/gem_version.rb               | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index d743c1c0d9..ac86cc89be 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -146,6 +146,8 @@ module Rails
           if respond_to?(:active_record)
             active_record.collection_cache_versioning = true
           end
+        when "6.1"
+          load_defaults "6.0"
         else
           raise "Unknown version #{target_version.to_s.inspect}"
         end
diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb
index fea24810f5..a6b3ccf8f8 100644
--- a/railties/lib/rails/gem_version.rb
+++ b/railties/lib/rails/gem_version.rb
@@ -8,9 +8,9 @@ module Rails
 
   module VERSION
     MAJOR = 6
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
-    PRE   = "beta3"
+    PRE   = "alpha"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
-- 
cgit v1.2.3