From f3714a681f30b1b45ac2e7d98550be83b04aabf5 Mon Sep 17 00:00:00 2001 From: "Ben Sheldon [he/him]" Date: Mon, 21 Oct 2024 11:20:51 -0700 Subject: [PATCH 1/3] Update README.md to note that Rails 7.1+ will still need to add trilogy gem to Gemfile --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 50d6e80..d440e45 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Ruby on Rails Active Record database adapter for [Trilogy](https://github.com/tr This gem offers Trilogy support for versions of Active Record prior to v7.1. Currently supports: -- ⚠️ Rails v7.1+ includes Trilogy support by default making this gem unnecessary +- ⚠️ Rails v7.1+ includes Trilogy support by default making this gem unnecessary; do add `gem "trilogy"` to your Gemfile - ✅ Rails v7.0.x - ✅ Rails v6.1.x - ✅ Rails v6.0.x From 54cbec21b21dd0b8592286c357e14a09eba72490 Mon Sep 17 00:00:00 2001 From: Lorin Thwaits Date: Mon, 3 Feb 2025 20:14:33 +0000 Subject: [PATCH 2/3] Slighty update the README note about adding gemfile 'trilogy' --- Gemfile | 4 ++++ README.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2009ef4..ac0867b 100644 --- a/Gemfile +++ b/Gemfile @@ -11,3 +11,7 @@ end gem "trilogy" gemspec + +# Separately require this due to concurrent_ruby 1.3.5 and later removing the +# dependency to logger +require "logger" diff --git a/README.md b/README.md index d440e45..29cca36 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Ruby on Rails Active Record database adapter for [Trilogy](https://github.com/tr This gem offers Trilogy support for versions of Active Record prior to v7.1. Currently supports: -- ⚠️ Rails v7.1+ includes Trilogy support by default making this gem unnecessary; do add `gem "trilogy"` to your Gemfile +- ⚠️ Rails v7.1+ includes Trilogy support by default making this gem unnecessary (and still do add `gem "trilogy"` to your Gemfile) - ✅ Rails v7.0.x - ✅ Rails v6.1.x - ✅ Rails v6.0.x From 82c2177f7cc6190839e3efb3c134649e85ae5f05 Mon Sep 17 00:00:00 2001 From: "Ben Sheldon [he/him]" Date: Mon, 3 Feb 2025 14:57:22 -0800 Subject: [PATCH 3/3] remove errant change --- Gemfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Gemfile b/Gemfile index ac0867b..2009ef4 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,3 @@ end gem "trilogy" gemspec - -# Separately require this due to concurrent_ruby 1.3.5 and later removing the -# dependency to logger -require "logger"