From d9af12bb302d01949fe1cc61dadb9840a0180062 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Wed, 5 Jun 2024 13:31:32 -0700 Subject: [PATCH 1/4] fix --- Gemfile | 2 +- Gemfile.lock | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index e2709d9d..d5b421e7 100644 --- a/Gemfile +++ b/Gemfile @@ -90,7 +90,7 @@ group :development do gem "draft_generators" gem "grade_runner" gem "pry-rails" - gem "rails_db" + gem "rails_db", git: "https://github.com/bpurinton/rails_db.git", branch: "bp-fix-for-rails-7-1" gem "rails-erd" gem "rufo" gem "specs_to_readme" diff --git a/Gemfile.lock b/Gemfile.lock index 15c2ac33..b4318a22 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,16 @@ +GIT + remote: https://github.com/bpurinton/rails_db.git + revision: 9980d54b1b95277e502a9b47cac96f90fb896d0b + branch: bp-fix-for-rails-7-1 + specs: + rails_db (2.4.2) + activerecord + kaminari + rails (>= 5.0.0) + ransack (>= 2.3.2) + simple_form (>= 5.0.1) + terminal-table + GEM remote: https://rubygems.org/ specs: @@ -284,13 +297,6 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails_db (2.4.2) - activerecord - kaminari - rails (>= 5.0.0) - ransack (>= 2.3.2) - simple_form (>= 5.0.1) - terminal-table railties (7.1.3.3) actionpack (= 7.1.3.3) activesupport (= 7.1.3.3) @@ -410,6 +416,7 @@ GEM zeitwerk (2.6.15) PLATFORMS + x86_64-darwin-22 x86_64-linux DEPENDENCIES @@ -436,7 +443,7 @@ DEPENDENCIES puma rails (~> 7.1.3, >= 7.1.3.2) rails-erd - rails_db + rails_db! redis (~> 4.0) rspec-html-matchers rspec-rails (~> 6.0.0) From 8316b297681ed13b2903e9b9d9941aa3017b137f Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Wed, 5 Jun 2024 13:32:34 -0700 Subject: [PATCH 2/4] revert fix --- Gemfile | 2 +- Gemfile.lock | 22 ++++++++-------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index d5b421e7..e2709d9d 100644 --- a/Gemfile +++ b/Gemfile @@ -90,7 +90,7 @@ group :development do gem "draft_generators" gem "grade_runner" gem "pry-rails" - gem "rails_db", git: "https://github.com/bpurinton/rails_db.git", branch: "bp-fix-for-rails-7-1" + gem "rails_db" gem "rails-erd" gem "rufo" gem "specs_to_readme" diff --git a/Gemfile.lock b/Gemfile.lock index b4318a22..f15f7fed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,16 +1,3 @@ -GIT - remote: https://github.com/bpurinton/rails_db.git - revision: 9980d54b1b95277e502a9b47cac96f90fb896d0b - branch: bp-fix-for-rails-7-1 - specs: - rails_db (2.4.2) - activerecord - kaminari - rails (>= 5.0.0) - ransack (>= 2.3.2) - simple_form (>= 5.0.1) - terminal-table - GEM remote: https://rubygems.org/ specs: @@ -297,6 +284,13 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) + rails_db (2.4.2) + activerecord + kaminari + rails (>= 5.0.0) + ransack (>= 2.3.2) + simple_form (>= 5.0.1) + terminal-table railties (7.1.3.3) actionpack (= 7.1.3.3) activesupport (= 7.1.3.3) @@ -443,7 +437,7 @@ DEPENDENCIES puma rails (~> 7.1.3, >= 7.1.3.2) rails-erd - rails_db! + rails_db redis (~> 4.0) rspec-html-matchers rspec-rails (~> 6.0.0) From 426adace1e1bf1361d073dc52948a3cc5a05a8b4 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Wed, 5 Jun 2024 13:33:00 -0700 Subject: [PATCH 3/4] ignore missing callback --- config/environments/development.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index 1083f145..af0d18e0 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -81,7 +81,7 @@ # config.action_cable.disable_request_forgery_protection = true # Raise error when a before_action's only/except options reference missing actions - config.action_controller.raise_on_missing_callback_actions = true + config.action_controller.raise_on_missing_callback_actions = false # Allow POST authenticity on Codespaces in dev config.action_controller.forgery_protection_origin_check = false From 887eae425ec201e16a8e2ff311ea29288d414047 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Wed, 5 Jun 2024 13:33:25 -0700 Subject: [PATCH 4/4] remove platform --- Gemfile.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f15f7fed..15c2ac33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -410,7 +410,6 @@ GEM zeitwerk (2.6.15) PLATFORMS - x86_64-darwin-22 x86_64-linux DEPENDENCIES