From b4022f527db336eecf50b455b344a98c3d77cd49 Mon Sep 17 00:00:00 2001 From: Sara Jackson Date: Mon, 15 Apr 2024 08:10:18 -0400 Subject: [PATCH] Drop Ruby 2.76 and Rails 6.0 (#1005) - Drops support for Rails 6.0, see https://endoflife.date/rails - Drops support for Ruby 2.7.6, see https://endoflife.date/ruby - Drop unused gemfiles and update Gemfile.lock --- .github/workflows/tests.yml | 2 -- Appraisals | 6 ------ CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- README.md | 2 +- gemfiles/rails_5.0.gemfile | 21 --------------------- gemfiles/rails_5.1.gemfile | 21 --------------------- gemfiles/rails_5.2.gemfile | 21 --------------------- gemfiles/rails_6.0.gemfile | 23 ----------------------- 9 files changed, 7 insertions(+), 96 deletions(-) delete mode 100644 gemfiles/rails_5.0.gemfile delete mode 100644 gemfiles/rails_5.1.gemfile delete mode 100644 gemfiles/rails_5.2.gemfile delete mode 100644 gemfiles/rails_6.0.gemfile diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0f4c5e14f..e9d36be79 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,12 +16,10 @@ jobs: fail-fast: false matrix: gemfile: - - "6.0" - "6.1" - "7.0" - "7.1" ruby: - - "2.7.6" - "3.0.4" - "3.1.2" - "3.2.2" diff --git a/Appraisals b/Appraisals index 466faf4fc..016160470 100644 --- a/Appraisals +++ b/Appraisals @@ -1,9 +1,3 @@ -appraise "rails_6.0" do - gem "railties", "~> 6.0.0" - gem "net-smtp", require: false # not bundled in ruby 3.1 - gem "psych", "< 4" # psych 4 switched from unsafe load to safe load -end - appraise "rails_6.1" do gem "railties", "~> 6.1.0" gem "net-smtp", require: false # not bundled in ruby 3.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0586b40fe..2cc49a96b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ complete changelog, see the git history for each version via the version links. ## [Unreleased] +- Drops support for Rails 6.0, see https://endoflife.date/rails +- Drops support for Ruby 2.7.6, see https://endoflife.date/ruby + [Unreleased]: https://github.com/thoughtbot/clearance/compare/v2.6.2...main ## [2.6.2] January 15, 2024 @@ -20,6 +23,8 @@ deprecated active record handling in application.rb (#998) - Replace mentions of NEWS.md with CHANGELOG.md (#982) - Fix broken thoughtbot logo on README.md +[2.6.2]: https://github.com/thoughtbot/clearance/compare/v2.6.1...v2.6.2 + ## [2.6.1] - September 23, 2022 - Document how to report security issues - Only update the `env["QUERY_STRING"]` if the `as` parameter is present in diff --git a/Gemfile.lock b/Gemfile.lock index 5b102bf6a..009e82344 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -171,7 +171,7 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.0.6) + rake (13.1.0) regexp_parser (2.5.0) rexml (3.2.5) rspec-core (3.11.0) diff --git a/README.md b/README.md index 7d0714638..9eba4c092 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ monitored by contributors. ## Getting Started -Clearance is a Rails engine tested against Rails `>= 6.0` and Ruby `>= 2.7.0`. +Clearance is a Rails engine tested against Rails `>= 6.1` and Ruby `>= 3.0.0`. You can add it to your Gemfile with: diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile deleted file mode 100644 index c6376fee4..000000000 --- a/gemfiles/rails_5.0.gemfile +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "addressable" -gem "ammeter" -gem "appraisal" -gem "capybara", ">= 2.6.2", "< 3.33.0" -gem "database_cleaner" -gem "erb_lint", require: false -gem "factory_bot_rails" -gem "nokogiri" -gem "pry", require: false -gem "rails-controller-testing" -gem "rspec-rails", "~> 3.1" -gem "shoulda-matchers" -gem "sqlite3", "~> 1.3.13" -gem "timecop" -gem "railties", "~> 5.0" - -gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile deleted file mode 100644 index 3de2ac463..000000000 --- a/gemfiles/rails_5.1.gemfile +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "addressable" -gem "ammeter" -gem "appraisal" -gem "capybara" -gem "database_cleaner" -gem "erb_lint", require: false -gem "factory_bot_rails" -gem "nokogiri" -gem "pry", require: false -gem "rails-controller-testing" -gem "rspec-rails" -gem "shoulda-matchers" -gem "sqlite3" -gem "timecop" -gem "railties", "~> 5.1" - -gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile deleted file mode 100644 index f1863326b..000000000 --- a/gemfiles/rails_5.2.gemfile +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "addressable" -gem "ammeter" -gem "appraisal" -gem "capybara" -gem "database_cleaner" -gem "erb_lint", require: false -gem "factory_bot_rails" -gem "nokogiri" -gem "pry", require: false -gem "rails-controller-testing" -gem "rspec-rails" -gem "shoulda-matchers" -gem "sqlite3" -gem "timecop" -gem "railties", "~> 5.2" - -gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile deleted file mode 100644 index 8896d145e..000000000 --- a/gemfiles/rails_6.0.gemfile +++ /dev/null @@ -1,23 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "addressable" -gem "ammeter" -gem "appraisal" -gem "capybara" -gem "database_cleaner" -gem "erb_lint", require: false -gem "factory_bot_rails" -gem "nokogiri" -gem "pry", require: false -gem "rails-controller-testing" -gem "rspec-rails" -gem "shoulda-matchers" -gem "sqlite3" -gem "timecop" -gem "railties", "~> 6.0.0" -gem "net-smtp", require: false -gem "psych", "< 4" - -gemspec path: "../"