Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for Rails 6.1 and Ruby 3.0 #1036

Merged
merged 2 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,13 @@ jobs:
fail-fast: false
matrix:
gemfile:
- "6.1"
- "7.0"
- "7.1"
- "7.2"
ruby:
- "3.0.7"
- "3.1.6"
- "3.2.5"
- "3.3.4"
exclude:
- gemfile: "7.2"
ruby: "3.0.7"
- "3.3.5"

env:
BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.gemfile }}.gemfile
Expand Down
10 changes: 0 additions & 10 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
appraise "rails_6.1" do
gem "railties", "~> 6.1.0"
gem "net-smtp", require: false # not bundled in ruby 3.1
# The following gems will not be bundled with Ruby 3.4
gem "base64", require: false
gem "bigdecimal", require: false
gem "drb", require: false
gem "mutex_m", require: false
end

appraise "rails_7.0" do
gem "railties", "~> 7.0.0"
# The following gems will not be bundled with Ruby 3.4
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ monitored by contributors.

## Getting Started

Clearance is a Rails engine tested against Rails `>= 6.1` and Ruby `>= 3.0.0`.
Clearance is a Rails engine tested against Rails `>= 7.0` and Ruby `>= 3.1.6`.

You can add it to your Gemfile with:

Expand Down
25 changes: 0 additions & 25 deletions gemfiles/rails_6.1.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion spec/support/html_escape_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module HTMLEscapeHelper
def translated_string(key)
if [7.0, 7.1].include?(Rails::VERSION::STRING.to_f)
if [7.0].include?(Rails::VERSION::STRING.to_f)
ERB::Util.html_escape_once(I18n.t(key))
else
I18n.t(key)
Expand Down