Skip to content

Commit 9d2e19a

Browse files
committed
Upgrade to rails 7.1 (#557)
* Upgrade rails to 7.1 * Remove the code related to legacy_connection_handling * Fix showing ruby version in CI * Replace secrets with credentials
1 parent 9d9f791 commit 9d2e19a

File tree

5 files changed

+89
-73
lines changed

5 files changed

+89
-73
lines changed

.github/workflows/rspec_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Checkout code
5151
uses: actions/checkout@v3
5252

53-
- name: Use Ruby ${{ matrix.node }}
53+
- name: Use Ruby ${{ matrix.ruby }}
5454
uses: ruby/setup-ruby@v1
5555
with:
5656
ruby-version: ${{ matrix.ruby }}

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gem "shakapacker", "7.0.3"
1111

1212
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
1313
gem "listen"
14-
gem "rails", "~> 7.0"
14+
gem "rails", "~> 7.1"
1515

1616
gem "pg"
1717

Gemfile.lock

Lines changed: 86 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,87 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.0.7.2)
5-
actionpack (= 7.0.7.2)
6-
activesupport (= 7.0.7.2)
4+
actioncable (7.1.1)
5+
actionpack (= 7.1.1)
6+
activesupport (= 7.1.1)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (7.0.7.2)
10-
actionpack (= 7.0.7.2)
11-
activejob (= 7.0.7.2)
12-
activerecord (= 7.0.7.2)
13-
activestorage (= 7.0.7.2)
14-
activesupport (= 7.0.7.2)
9+
zeitwerk (~> 2.6)
10+
actionmailbox (7.1.1)
11+
actionpack (= 7.1.1)
12+
activejob (= 7.1.1)
13+
activerecord (= 7.1.1)
14+
activestorage (= 7.1.1)
15+
activesupport (= 7.1.1)
1516
mail (>= 2.7.1)
1617
net-imap
1718
net-pop
1819
net-smtp
19-
actionmailer (7.0.7.2)
20-
actionpack (= 7.0.7.2)
21-
actionview (= 7.0.7.2)
22-
activejob (= 7.0.7.2)
23-
activesupport (= 7.0.7.2)
20+
actionmailer (7.1.1)
21+
actionpack (= 7.1.1)
22+
actionview (= 7.1.1)
23+
activejob (= 7.1.1)
24+
activesupport (= 7.1.1)
2425
mail (~> 2.5, >= 2.5.4)
2526
net-imap
2627
net-pop
2728
net-smtp
28-
rails-dom-testing (~> 2.0)
29-
actionpack (7.0.7.2)
30-
actionview (= 7.0.7.2)
31-
activesupport (= 7.0.7.2)
32-
rack (~> 2.0, >= 2.2.4)
29+
rails-dom-testing (~> 2.2)
30+
actionpack (7.1.1)
31+
actionview (= 7.1.1)
32+
activesupport (= 7.1.1)
33+
nokogiri (>= 1.8.5)
34+
rack (>= 2.2.4)
35+
rack-session (>= 1.0.1)
3336
rack-test (>= 0.6.3)
34-
rails-dom-testing (~> 2.0)
35-
rails-html-sanitizer (~> 1.0, >= 1.2.0)
36-
actiontext (7.0.7.2)
37-
actionpack (= 7.0.7.2)
38-
activerecord (= 7.0.7.2)
39-
activestorage (= 7.0.7.2)
40-
activesupport (= 7.0.7.2)
37+
rails-dom-testing (~> 2.2)
38+
rails-html-sanitizer (~> 1.6)
39+
actiontext (7.1.1)
40+
actionpack (= 7.1.1)
41+
activerecord (= 7.1.1)
42+
activestorage (= 7.1.1)
43+
activesupport (= 7.1.1)
4144
globalid (>= 0.6.0)
4245
nokogiri (>= 1.8.5)
43-
actionview (7.0.7.2)
44-
activesupport (= 7.0.7.2)
46+
actionview (7.1.1)
47+
activesupport (= 7.1.1)
4548
builder (~> 3.1)
46-
erubi (~> 1.4)
47-
rails-dom-testing (~> 2.0)
48-
rails-html-sanitizer (~> 1.1, >= 1.2.0)
49-
activejob (7.0.7.2)
50-
activesupport (= 7.0.7.2)
49+
erubi (~> 1.11)
50+
rails-dom-testing (~> 2.2)
51+
rails-html-sanitizer (~> 1.6)
52+
activejob (7.1.1)
53+
activesupport (= 7.1.1)
5154
globalid (>= 0.3.6)
52-
activemodel (7.0.7.2)
53-
activesupport (= 7.0.7.2)
54-
activerecord (7.0.7.2)
55-
activemodel (= 7.0.7.2)
56-
activesupport (= 7.0.7.2)
57-
activestorage (7.0.7.2)
58-
actionpack (= 7.0.7.2)
59-
activejob (= 7.0.7.2)
60-
activerecord (= 7.0.7.2)
61-
activesupport (= 7.0.7.2)
55+
activemodel (7.1.1)
56+
activesupport (= 7.1.1)
57+
activerecord (7.1.1)
58+
activemodel (= 7.1.1)
59+
activesupport (= 7.1.1)
60+
timeout (>= 0.4.0)
61+
activestorage (7.1.1)
62+
actionpack (= 7.1.1)
63+
activejob (= 7.1.1)
64+
activerecord (= 7.1.1)
65+
activesupport (= 7.1.1)
6266
marcel (~> 1.0)
63-
mini_mime (>= 1.1.0)
64-
activesupport (7.0.7.2)
67+
activesupport (7.1.1)
68+
base64
69+
bigdecimal
6570
concurrent-ruby (~> 1.0, >= 1.0.2)
71+
connection_pool (>= 2.2.5)
72+
drb
6673
i18n (>= 1.6, < 2)
6774
minitest (>= 5.1)
75+
mutex_m
6876
tzinfo (~> 2.0)
6977
addressable (2.8.5)
7078
public_suffix (>= 2.0.2, < 6.0)
7179
ast (2.4.2)
7280
autoprefixer-rails (10.4.13.0)
7381
execjs (~> 2)
7482
awesome_print (1.9.2)
83+
base64 (0.1.1)
84+
bigdecimal (3.1.4)
7585
bindex (0.8.1)
7686
binding_of_caller (1.0.0)
7787
debug_inspector (>= 0.0.1)
@@ -126,6 +136,8 @@ GEM
126136
diff-lcs (1.5.0)
127137
docile (1.4.0)
128138
dotenv (2.8.1)
139+
drb (2.1.1)
140+
ruby2_keywords
129141
erubi (1.12.0)
130142
erubis (2.7.0)
131143
execjs (2.8.1)
@@ -170,6 +182,7 @@ GEM
170182
mini_mime (1.1.5)
171183
mini_portile2 (2.8.4)
172184
minitest (5.19.0)
185+
mutex_m (0.1.2)
173186
net-imap (0.3.7)
174187
date
175188
net-protocol
@@ -218,22 +231,27 @@ GEM
218231
rack (2.2.8)
219232
rack-proxy (0.7.7)
220233
rack
234+
rack-session (1.0.1)
235+
rack (< 3)
221236
rack-test (2.1.0)
222237
rack (>= 1.3)
223-
rails (7.0.7.2)
224-
actioncable (= 7.0.7.2)
225-
actionmailbox (= 7.0.7.2)
226-
actionmailer (= 7.0.7.2)
227-
actionpack (= 7.0.7.2)
228-
actiontext (= 7.0.7.2)
229-
actionview (= 7.0.7.2)
230-
activejob (= 7.0.7.2)
231-
activemodel (= 7.0.7.2)
232-
activerecord (= 7.0.7.2)
233-
activestorage (= 7.0.7.2)
234-
activesupport (= 7.0.7.2)
238+
rackup (1.0.0)
239+
rack (< 3)
240+
webrick
241+
rails (7.1.1)
242+
actioncable (= 7.1.1)
243+
actionmailbox (= 7.1.1)
244+
actionmailer (= 7.1.1)
245+
actionpack (= 7.1.1)
246+
actiontext (= 7.1.1)
247+
actionview (= 7.1.1)
248+
activejob (= 7.1.1)
249+
activemodel (= 7.1.1)
250+
activerecord (= 7.1.1)
251+
activestorage (= 7.1.1)
252+
activesupport (= 7.1.1)
235253
bundler (>= 1.15.0)
236-
railties (= 7.0.7.2)
254+
railties (= 7.1.1)
237255
rails-dom-testing (2.2.0)
238256
activesupport (>= 5.0.0)
239257
minitest
@@ -249,13 +267,14 @@ GEM
249267
json
250268
require_all (~> 3.0)
251269
ruby-progressbar
252-
railties (7.0.7.2)
253-
actionpack (= 7.0.7.2)
254-
activesupport (= 7.0.7.2)
255-
method_source
270+
railties (7.1.1)
271+
actionpack (= 7.1.1)
272+
activesupport (= 7.1.1)
273+
irb
274+
rackup (>= 1.0.0)
256275
rake (>= 12.2)
257-
thor (~> 1.0)
258-
zeitwerk (~> 2.5)
276+
thor (~> 1.0, >= 1.2.2)
277+
zeitwerk (~> 2.6)
259278
rainbow (3.1.1)
260279
rake (13.0.6)
261280
rb-fsevent (0.11.2)
@@ -314,6 +333,7 @@ GEM
314333
rubocop-rspec (2.11.1)
315334
rubocop (~> 1.19)
316335
ruby-progressbar (1.13.0)
336+
ruby2_keywords (0.0.5)
317337
rubyzip (2.3.2)
318338
sass (3.7.4)
319339
sass-listen (~> 4.0.0)
@@ -386,6 +406,7 @@ GEM
386406
activemodel (>= 6.0.0)
387407
bindex (>= 0.4.0)
388408
railties (>= 6.0.0)
409+
webrick (1.8.1)
389410
websocket (1.2.9)
390411
websocket-driver (0.7.6)
391412
websocket-extensions (>= 0.1.0)
@@ -427,7 +448,7 @@ DEPENDENCIES
427448
pry-rescue
428449
pry-stack_explorer
429450
puma
430-
rails (~> 7.0)
451+
rails (~> 7.1)
431452
rails-html-sanitizer
432453
rails_best_practices
433454
rainbow

config/application.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Application < Rails::Application
1515

1616
# Configuration for the application, engines, and railties goes here.
1717

18-
config.action_cable.allowed_request_origins = [Rails.application.secrets.action_cable_url]
18+
config.action_cable.allowed_request_origins = [Rails.application.credentials.action_cable_url]
1919

2020
# These settings can be overridden in specific environments using the files
2121
# in config/environments, which are processed later.

config/initializers/new_framework_defaults_6_1.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@
4141
# requests to HTTPS in `ActionDispatch::SSL` middleware.
4242
# Rails.application.config.action_dispatch.ssl_default_redirect_status = 308
4343

44-
# Use new connection handling API. For most applications this won't have any
45-
# effect. For applications using multiple databases, this new API provides
46-
# support for granular connection swapping.
47-
Rails.application.config.active_record.legacy_connection_handling = false
48-
4944
# Make `form_with` generate non-remote forms by default.
5045
# Rails.application.config.action_view.form_with_generates_remote_forms = false
5146

0 commit comments

Comments
 (0)