Skip to content

Commit b704feb

Browse files
committed
Make Rails 7.1 the current and 'main' the next
1 parent fe225fd commit b704feb

File tree

12 files changed

+609
-278
lines changed

12 files changed

+609
-278
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ruby '3.1.3'
1010
if next?
1111
gem 'rails', github: 'rails/rails', branch: 'main'
1212
else
13-
gem 'rails', '~> 7.0.0'
13+
gem 'rails', '~> 7.1.0'
1414
end
1515
# Use postgresql as the database for Active Record
1616
gem 'pg', '>= 0.18', '< 2.0'

Gemfile.lock

Lines changed: 136 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,156 +1,182 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.0.4.3)
5-
actionpack (= 7.0.4.3)
6-
activesupport (= 7.0.4.3)
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.4.3)
10-
actionpack (= 7.0.4.3)
11-
activejob (= 7.0.4.3)
12-
activerecord (= 7.0.4.3)
13-
activestorage (= 7.0.4.3)
14-
activesupport (= 7.0.4.3)
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.4.3)
20-
actionpack (= 7.0.4.3)
21-
actionview (= 7.0.4.3)
22-
activejob (= 7.0.4.3)
23-
activesupport (= 7.0.4.3)
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.4.3)
30-
actionview (= 7.0.4.3)
31-
activesupport (= 7.0.4.3)
32-
rack (~> 2.0, >= 2.2.0)
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.4.3)
37-
actionpack (= 7.0.4.3)
38-
activerecord (= 7.0.4.3)
39-
activestorage (= 7.0.4.3)
40-
activesupport (= 7.0.4.3)
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.4.3)
44-
activesupport (= 7.0.4.3)
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.4.3)
50-
activesupport (= 7.0.4.3)
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.4.3)
53-
activesupport (= 7.0.4.3)
54-
activerecord (7.0.4.3)
55-
activemodel (= 7.0.4.3)
56-
activesupport (= 7.0.4.3)
57-
activestorage (7.0.4.3)
58-
actionpack (= 7.0.4.3)
59-
activejob (= 7.0.4.3)
60-
activerecord (= 7.0.4.3)
61-
activesupport (= 7.0.4.3)
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.4.3)
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
babel-source (5.8.35)
7078
babel-transpiler (0.7.0)
7179
babel-source (>= 4.0, < 6)
7280
execjs (~> 2.0)
81+
base64 (0.1.1)
82+
bigdecimal (3.1.4)
7383
bindex (0.8.1)
7484
builder (3.2.4)
7585
byebug (11.1.3)
7686
code_analyzer (0.5.2)
7787
sexp_processor
7888
concurrent-ruby (1.2.2)
89+
connection_pool (2.4.1)
7990
crass (1.0.6)
8091
date (3.3.3)
92+
drb (2.1.1)
93+
ruby2_keywords
8194
erubi (1.12.0)
8295
erubis (2.7.0)
8396
execjs (2.8.1)
84-
ffi (1.15.3)
97+
ffi (1.15.4)
8598
foundation-rails (6.6.2.0)
8699
railties (>= 3.1.0)
87100
sass (>= 3.3.0)
88101
sprockets-es6 (>= 0.9.0)
89-
globalid (1.1.0)
90-
activesupport (>= 5.0)
91-
i18n (1.12.0)
102+
globalid (1.2.1)
103+
activesupport (>= 6.1)
104+
i18n (1.14.1)
92105
concurrent-ruby (~> 1.0)
106+
io-console (0.6.0)
107+
irb (1.8.3)
108+
rdoc
109+
reline (>= 0.3.8)
93110
jbuilder (2.11.2)
94111
activesupport (>= 5.0.0)
95-
json (2.5.1)
96-
listen (3.5.1)
112+
json (2.6.0)
113+
listen (3.7.0)
97114
rb-fsevent (~> 0.10, >= 0.10.3)
98115
rb-inotify (~> 0.9, >= 0.9.10)
99-
loofah (2.19.1)
116+
loofah (2.21.4)
100117
crass (~> 1.0.2)
101-
nokogiri (>= 1.5.9)
118+
nokogiri (>= 1.12.0)
102119
mail (2.8.1)
103120
mini_mime (>= 0.1.1)
104121
net-imap
105122
net-pop
106123
net-smtp
107124
marcel (1.0.2)
108-
method_source (1.0.0)
109-
mini_mime (1.1.2)
110-
mini_portile2 (2.8.1)
111-
minitest (5.18.0)
112-
net-imap (0.3.4)
125+
mini_mime (1.1.5)
126+
minitest (5.20.0)
127+
mutex_m (0.1.2)
128+
net-imap (0.4.2)
113129
date
114130
net-protocol
115131
net-pop (0.1.2)
116132
net-protocol
117133
net-protocol (0.2.1)
118134
timeout
119-
net-smtp (0.3.3)
135+
net-smtp (0.4.0)
120136
net-protocol
121-
nio4r (2.5.8)
122-
nokogiri (1.14.2)
123-
mini_portile2 (~> 2.8.0)
137+
nio4r (2.5.9)
138+
nokogiri (1.15.4-x86_64-darwin)
139+
racc (~> 1.4)
140+
nokogiri (1.15.4-x86_64-linux)
124141
racc (~> 1.4)
125142
pg (1.2.3)
126-
power_assert (2.0.0)
127-
puma (4.3.8)
143+
power_assert (2.0.1)
144+
psych (5.1.1.1)
145+
stringio
146+
puma (4.3.10)
128147
nio4r (~> 2.0)
129-
racc (1.6.2)
130-
rack (2.2.6.4)
148+
racc (1.7.1)
149+
rack (2.2.8)
131150
rack-proxy (0.7.6)
132151
rack
152+
rack-session (1.0.1)
153+
rack (< 3)
133154
rack-test (2.1.0)
134155
rack (>= 1.3)
135-
rails (7.0.4.3)
136-
actioncable (= 7.0.4.3)
137-
actionmailbox (= 7.0.4.3)
138-
actionmailer (= 7.0.4.3)
139-
actionpack (= 7.0.4.3)
140-
actiontext (= 7.0.4.3)
141-
actionview (= 7.0.4.3)
142-
activejob (= 7.0.4.3)
143-
activemodel (= 7.0.4.3)
144-
activerecord (= 7.0.4.3)
145-
activestorage (= 7.0.4.3)
146-
activesupport (= 7.0.4.3)
156+
rackup (1.0.0)
157+
rack (< 3)
158+
webrick
159+
rails (7.1.1)
160+
actioncable (= 7.1.1)
161+
actionmailbox (= 7.1.1)
162+
actionmailer (= 7.1.1)
163+
actionpack (= 7.1.1)
164+
actiontext (= 7.1.1)
165+
actionview (= 7.1.1)
166+
activejob (= 7.1.1)
167+
activemodel (= 7.1.1)
168+
activerecord (= 7.1.1)
169+
activestorage (= 7.1.1)
170+
activesupport (= 7.1.1)
147171
bundler (>= 1.15.0)
148-
railties (= 7.0.4.3)
149-
rails-dom-testing (2.0.3)
150-
activesupport (>= 4.2.0)
172+
railties (= 7.1.1)
173+
rails-dom-testing (2.2.0)
174+
activesupport (>= 5.0.0)
175+
minitest
151176
nokogiri (>= 1.6)
152-
rails-html-sanitizer (1.5.0)
153-
loofah (~> 2.19, >= 2.19.1)
177+
rails-html-sanitizer (1.6.0)
178+
loofah (~> 2.21)
179+
nokogiri (~> 1.14)
154180
rails_best_practices (1.21.0)
155181
activesupport
156182
code_analyzer (>= 0.5.2)
@@ -159,19 +185,25 @@ GEM
159185
json
160186
require_all (~> 3.0)
161187
ruby-progressbar
162-
railties (7.0.4.3)
163-
actionpack (= 7.0.4.3)
164-
activesupport (= 7.0.4.3)
165-
method_source
188+
railties (7.1.1)
189+
actionpack (= 7.1.1)
190+
activesupport (= 7.1.1)
191+
irb
192+
rackup (>= 1.0.0)
166193
rake (>= 12.2)
167-
thor (~> 1.0)
168-
zeitwerk (~> 2.5)
194+
thor (~> 1.0, >= 1.2.2)
195+
zeitwerk (~> 2.6)
169196
rake (13.0.6)
170197
rb-fsevent (0.11.0)
171198
rb-inotify (0.10.1)
172199
ffi (~> 1.0)
200+
rdoc (6.5.0)
201+
psych (>= 4.0.0)
202+
reline (0.3.9)
203+
io-console (~> 0.5)
173204
require_all (3.0.0)
174205
ruby-progressbar (1.11.0)
206+
ruby2_keywords (0.0.5)
175207
sass (3.7.4)
176208
sass-listen (~> 4.0.0)
177209
sass-listen (4.0.0)
@@ -189,22 +221,23 @@ GEM
189221
tilt
190222
semantic_range (3.0.0)
191223
sexp_processor (4.15.3)
192-
sprockets (4.2.0)
224+
sprockets (4.0.2)
193225
concurrent-ruby (~> 1.0)
194-
rack (>= 2.2.4, < 4)
226+
rack (> 1, < 3)
195227
sprockets-es6 (0.9.2)
196228
babel-source (>= 5.8.11)
197229
babel-transpiler
198230
sprockets (>= 3.0.0)
199-
sprockets-rails (3.4.2)
200-
actionpack (>= 5.2)
201-
activesupport (>= 5.2)
231+
sprockets-rails (3.2.2)
232+
actionpack (>= 4.0)
233+
activesupport (>= 4.0)
202234
sprockets (>= 3.0.0)
203-
test-unit (3.4.4)
235+
stringio (3.0.8)
236+
test-unit (3.5.0)
204237
power_assert
205-
thor (1.2.1)
238+
thor (1.3.0)
206239
tilt (2.0.10)
207-
timeout (0.3.2)
240+
timeout (0.4.0)
208241
tzinfo (2.0.6)
209242
concurrent-ruby (~> 1.0)
210243
web-console (4.1.0)
@@ -217,13 +250,15 @@ GEM
217250
rack-proxy (>= 0.6.1)
218251
railties (>= 5.2)
219252
semantic_range (>= 2.3.0)
220-
websocket-driver (0.7.5)
253+
webrick (1.8.1)
254+
websocket-driver (0.7.6)
221255
websocket-extensions (>= 0.1.0)
222256
websocket-extensions (0.1.5)
223-
zeitwerk (2.6.7)
257+
zeitwerk (2.6.12)
224258

225259
PLATFORMS
226-
ruby
260+
x86_64-darwin-19
261+
x86_64-linux
227262

228263
DEPENDENCIES
229264
byebug
@@ -232,7 +267,7 @@ DEPENDENCIES
232267
listen (~> 3.2)
233268
pg (>= 0.18, < 2.0)
234269
puma (~> 4.1)
235-
rails (~> 7.0.0)
270+
rails (~> 7.1.0)
236271
rails_best_practices
237272
sass-rails
238273
test-unit

0 commit comments

Comments
 (0)