From 6c08d480f13d3332c878ca8a120a03fcd78f7ba2 Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Wed, 22 Mar 2017 10:11:39 +1030
Subject: Start Rails 5.2 development

---
 version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'version.rb')

diff --git a/version.rb b/version.rb
index 3174ffb0dc..7bacf2e0ba 100644
--- a/version.rb
+++ b/version.rb
@@ -6,9 +6,9 @@ module Rails
 
   module VERSION
     MAJOR = 5
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
-    PRE   = "beta1"
+    PRE   = "alpha"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
-- 
cgit v1.2.3


From cfade1ec7ee7b5b51f3c1578e3474f9c156f2971 Mon Sep 17 00:00:00 2001
From: Kir Shatrov <shatrov@me.com>
Date: Thu, 22 Jun 2017 22:59:18 -0400
Subject: Enforce frozen string in Rubocop

---
 version.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'version.rb')

diff --git a/version.rb b/version.rb
index 7bacf2e0ba..68af9946e5 100644
--- a/version.rb
+++ b/version.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rails
   # Returns the version of the currently loaded Rails as a <tt>Gem::Version</tt>
   def self.gem_version
-- 
cgit v1.2.3


From 87b3e226d65ac1ed371620bfdcd2f950c87cfece Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sun, 2 Jul 2017 02:15:17 +0930
Subject: Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"

This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing
changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
---
 version.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'version.rb')

diff --git a/version.rb b/version.rb
index 68af9946e5..7bacf2e0ba 100644
--- a/version.rb
+++ b/version.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module Rails
   # Returns the version of the currently loaded Rails as a <tt>Gem::Version</tt>
   def self.gem_version
-- 
cgit v1.2.3