From 61ed0a64b8cfdf4e06898e80dbc2f854cdd2c648 Mon Sep 17 00:00:00 2001
From: Ryan W <rwilliamz@gmail.com>
Date: Tue, 4 Jan 2022 21:45:12 -0800
Subject: [PATCH] switch to rails gem and bundle update

---
 Gemfile      |  4 ++--
 Gemfile.lock | 64 ++++++++++++++++++++++++----------------------------
 2 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/Gemfile b/Gemfile
index fd38938..af8c678 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,8 +6,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby "3.1.0"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-# gem "rails", "~> 7.0.0"
-gem "rails", github: "rails/rails", branch: "7-0-stable"
+gem "rails", "~> 7.0.0"
+# gem "rails", github: "rails/rails", branch: "7-0-stable"
 
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
 gem "sprockets-rails", ">= 3.4.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index ca70fc4..b9081ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,5 @@
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: 46c056628a4a154af8fec7f48cbf633b6aac4316
-  branch: 7-0-stable
+GEM
+  remote: https://rubygems.org/
   specs:
     actioncable (7.0.0)
       actionpack (= 7.0.0)
@@ -62,31 +60,6 @@ GIT
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    rails (7.0.0)
-      actioncable (= 7.0.0)
-      actionmailbox (= 7.0.0)
-      actionmailer (= 7.0.0)
-      actionpack (= 7.0.0)
-      actiontext (= 7.0.0)
-      actionview (= 7.0.0)
-      activejob (= 7.0.0)
-      activemodel (= 7.0.0)
-      activerecord (= 7.0.0)
-      activestorage (= 7.0.0)
-      activesupport (= 7.0.0)
-      bundler (>= 1.15.0)
-      railties (= 7.0.0)
-    railties (7.0.0)
-      actionpack (= 7.0.0)
-      activesupport (= 7.0.0)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
@@ -127,7 +100,7 @@ GEM
     importmap-rails (1.0.1)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
-    io-console (0.5.10)
+    io-console (0.5.11)
     io-wait (0.2.1)
     irb (1.4.1)
       reline (>= 0.3.0)
@@ -167,7 +140,7 @@ GEM
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     parallel (1.21.0)
-    parser (3.0.3.2)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     pg (1.2.3)
     public_suffix (4.0.6)
@@ -179,16 +152,37 @@ GEM
       rack (>= 1.2.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
+    rails (7.0.0)
+      actioncable (= 7.0.0)
+      actionmailbox (= 7.0.0)
+      actionmailer (= 7.0.0)
+      actionpack (= 7.0.0)
+      actiontext (= 7.0.0)
+      actionview (= 7.0.0)
+      activejob (= 7.0.0)
+      activemodel (= 7.0.0)
+      activerecord (= 7.0.0)
+      activestorage (= 7.0.0)
+      activesupport (= 7.0.0)
+      bundler (>= 1.15.0)
+      railties (= 7.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
+    railties (7.0.0)
+      actionpack (= 7.0.0)
+      activesupport (= 7.0.0)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.0.0)
     rake (13.0.6)
     redis (4.5.1)
     regexp_parser (2.2.0)
-    reline (0.3.0)
+    reline (0.3.1)
       io-console (~> 0.5)
     rexml (3.2.5)
     rspec-core (3.10.1)
@@ -208,13 +202,13 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.3)
-    rubocop (1.24.0)
+    rubocop (1.24.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.15.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.15.1)
@@ -288,7 +282,7 @@ DEPENDENCIES
   pg (~> 1.1)
   puma (~> 5.0)
   rack-mini-profiler
-  rails!
+  rails (~> 7.0.0)
   redis (~> 4.0)
   rspec-rails
   rubocop-rails