Skip to content

Commit a9c3b50

Browse files
authored
Merge pull request #195 from publify/drop-rails-6-1-support
Drop support for Rails 6.1
2 parents 93f65b8 + 7161670 commit a9c3b50

File tree

6 files changed

+3
-18
lines changed

6 files changed

+3
-18
lines changed

.github/workflows/ruby.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,9 @@ jobs:
2929
matrix:
3030
ruby: ["3.2", "3.3", "3.4"]
3131
gemfile:
32-
- rails_61
3332
- rails_70
3433
- rails_71
3534
exclude:
36-
- ruby: "3.4"
37-
gemfile: rails_61
3835
- ruby: "3.4"
3936
gemfile: rails_70
4037

.rubocop.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ AllCops:
1919
- 'spec/dummy/db/schema.rb'
2020
NewCops: enable
2121
TargetRubyVersion: 3.2
22+
TargetRailsVersion: 7.0
2223

2324
Rails:
2425
Enabled: true

Appraisals

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ Customize.new heading: <<~HEADING.chomp
99
This file was generated by Appraisal
1010
HEADING
1111

12-
appraise "rails_61" do
13-
gem "rails", "~> 6.1.0"
14-
end
15-
1612
appraise "rails_70" do
1713
gem "rails", "~> 7.0.0"
1814
end

app/controllers/articles_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def redirect
9898
r = Redirect.find_by!(from_path: from)
9999
# TODO: If linked to article, directly redirect to the article.
100100
# Let redirection made outside of the blog on purpose (deal with it, Brakeman!)
101-
redirect_to r.full_to_path, status: :moved_permanently if r
101+
redirect_to r.full_to_path, allow_other_host: true, status: :moved_permanently if r
102102
end
103103

104104
def archives

gemfiles/rails_61.gemfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

spec/dummy/config/application.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
module Dummy
2525
class Application < Rails::Application
2626
# Initialize configuration defaults for originally generated Rails version.
27-
config.load_defaults 5.2
27+
config.load_defaults 7.0
2828

2929
# Settings in config/environments/* take precedence over those specified here.
3030
# Application configuration can go into files in config/initializers

0 commit comments

Comments
 (0)