From fc42a2774a3c96216d56f0c0fa95579e621fadf6 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Thu, 25 May 2023 19:26:42 +0900 Subject: [PATCH 1/2] Support `Configure legacy-API-supplied connection before first use` --- Gemfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index e11032910..c2bfcec15 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,11 @@ group :development do gem "rubocop-rails", require: false gem "rubocop-rspec", require: false +<<<<<<< HEAD gem "activerecord", github: "rails/rails", ref: "0e9267767f19065fa513038253179ad6b05c29ab" +======= + gem "activerecord", github: "rails/rails", ref: "deec3004d8d85443dc4f3f5fd22ab86b10adb58b" +>>>>>>> de98281a (Support `Configure legacy-API-supplied connection before first use`) gem "ruby-plsql", github: "rsim/ruby-plsql", branch: "master" platforms :ruby do From 932cf50e92463d1293d48893d51975c8b90244c3 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Wed, 13 Mar 2024 17:52:58 +0900 Subject: [PATCH 2/2] [DIAG] Let it fails fast --- .rspec | 1 + Gemfile | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.rspec b/.rspec index 1f88f5fbe..2d6ce1a7a 100644 --- a/.rspec +++ b/.rspec @@ -2,3 +2,4 @@ --backtrace --require spec_helper --warnings +--fail-fast diff --git a/Gemfile b/Gemfile index c2bfcec15..340394ad8 100644 --- a/Gemfile +++ b/Gemfile @@ -13,11 +13,7 @@ group :development do gem "rubocop-rails", require: false gem "rubocop-rspec", require: false -<<<<<<< HEAD - gem "activerecord", github: "rails/rails", ref: "0e9267767f19065fa513038253179ad6b05c29ab" -======= gem "activerecord", github: "rails/rails", ref: "deec3004d8d85443dc4f3f5fd22ab86b10adb58b" ->>>>>>> de98281a (Support `Configure legacy-API-supplied connection before first use`) gem "ruby-plsql", github: "rsim/ruby-plsql", branch: "master" platforms :ruby do