Skip to content

Commit 520dfea

Browse files
authored
Merge branch 'rails:main' into main
2 parents ba417f1 + 6f10ab3 commit 520dfea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+955
-377
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,3 @@ jobs:
5353
bin/rails db:setup
5454
- name: Run tests
5555
run: bin/rails test
56-
- name: Run tests with separate connection
57-
run: SEPARATE_CONNECTION=1 bin/rails test

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/tmp/
66
/test/dummy/db/*.sqlite3
77
/test/dummy/db/*.sqlite3-*
8-
/test/dummy/log/*.log
8+
/test/dummy/log/*.log*
99
/test/dummy/tmp/
1010

1111
# Folder for JetBrains IDEs
@@ -14,5 +14,8 @@
1414
# Folder for Visual Studio Code
1515
/.vscode/
1616

17+
# Files for RVM holdouts
18+
.ruby-gemset
19+
1720
# misc
1821
.DS_Store

.rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
inherit_gem: { rubocop-rails-omakase: rubocop.yml }
55

66
AllCops:
7-
TargetRubyVersion: 3.0
7+
TargetRubyVersion: 3.3
88
Exclude:
9-
- "test/dummy/db/schema.rb"
9+
- "**/*_schema.rb"

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.1
1+
3.3.5

Gemfile.lock

Lines changed: 72 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
solid_queue (1.0.0)
4+
solid_queue (1.1.0)
55
activejob (>= 7.1)
66
activerecord (>= 7.1)
77
concurrent-ruby (>= 1.3.1)
@@ -12,32 +12,32 @@ PATH
1212
GEM
1313
remote: https://rubygems.org/
1414
specs:
15-
actionpack (7.1.3.4)
16-
actionview (= 7.1.3.4)
17-
activesupport (= 7.1.3.4)
15+
actionpack (7.1.4.1)
16+
actionview (= 7.1.4.1)
17+
activesupport (= 7.1.4.1)
1818
nokogiri (>= 1.8.5)
1919
racc
2020
rack (>= 2.2.4)
2121
rack-session (>= 1.0.1)
2222
rack-test (>= 0.6.3)
2323
rails-dom-testing (~> 2.2)
2424
rails-html-sanitizer (~> 1.6)
25-
actionview (7.1.3.4)
26-
activesupport (= 7.1.3.4)
25+
actionview (7.1.4.1)
26+
activesupport (= 7.1.4.1)
2727
builder (~> 3.1)
2828
erubi (~> 1.11)
2929
rails-dom-testing (~> 2.2)
3030
rails-html-sanitizer (~> 1.6)
31-
activejob (7.1.3.4)
32-
activesupport (= 7.1.3.4)
31+
activejob (7.1.4.1)
32+
activesupport (= 7.1.4.1)
3333
globalid (>= 0.3.6)
34-
activemodel (7.1.3.4)
35-
activesupport (= 7.1.3.4)
36-
activerecord (7.1.3.4)
37-
activemodel (= 7.1.3.4)
38-
activesupport (= 7.1.3.4)
34+
activemodel (7.1.4.1)
35+
activesupport (= 7.1.4.1)
36+
activerecord (7.1.4.1)
37+
activemodel (= 7.1.4.1)
38+
activesupport (= 7.1.4.1)
3939
timeout (>= 0.4.0)
40-
activesupport (7.1.3.4)
40+
activesupport (7.1.4.1)
4141
base64
4242
bigdecimal
4343
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -54,9 +54,10 @@ GEM
5454
concurrent-ruby (1.3.4)
5555
connection_pool (2.4.1)
5656
crass (1.0.6)
57-
debug (1.7.1)
58-
irb (>= 1.5.0)
59-
reline (>= 0.3.1)
57+
date (3.4.1)
58+
debug (1.9.2)
59+
irb (~> 1.10)
60+
reline (>= 0.3.8)
6061
drb (2.2.1)
6162
erubi (1.13.0)
6263
et-orbi (1.2.11)
@@ -66,91 +67,94 @@ GEM
6667
raabro (~> 1.4)
6768
globalid (1.2.1)
6869
activesupport (>= 6.1)
69-
i18n (1.14.5)
70+
i18n (1.14.6)
7071
concurrent-ruby (~> 1.0)
71-
io-console (0.6.0)
72-
irb (1.6.2)
73-
reline (>= 0.3.0)
74-
json (2.7.1)
72+
io-console (0.7.2)
73+
irb (1.14.1)
74+
rdoc (>= 4.0.0)
75+
reline (>= 0.4.2)
76+
json (2.8.2)
7577
language_server-protocol (3.17.0.3)
76-
loofah (2.22.0)
78+
logger (1.6.2)
79+
loofah (2.23.1)
7780
crass (~> 1.0.2)
7881
nokogiri (>= 1.12.0)
79-
mini_portile2 (2.8.1)
80-
minitest (5.24.0)
82+
mini_portile2 (2.8.8)
83+
minitest (5.25.2)
8184
mocha (2.1.0)
8285
ruby2_keywords (>= 0.0.5)
83-
mutex_m (0.2.0)
84-
mysql2 (0.5.4)
85-
nio4r (2.7.0)
86-
nokogiri (1.16.6-arm64-darwin)
86+
mutex_m (0.3.0)
87+
mysql2 (0.5.6)
88+
nio4r (2.7.4)
89+
nokogiri (1.16.7-arm64-darwin)
8790
racc (~> 1.4)
88-
nokogiri (1.16.6-x86_64-darwin)
91+
nokogiri (1.16.7-x86_64-darwin)
8992
racc (~> 1.4)
90-
nokogiri (1.16.6-x86_64-linux)
93+
nokogiri (1.16.7-x86_64-linux)
9194
racc (~> 1.4)
92-
parallel (1.24.0)
93-
parser (3.3.0.5)
95+
parallel (1.26.3)
96+
parser (3.3.6.0)
9497
ast (~> 2.4.1)
9598
racc
9699
pg (1.5.4)
97-
puma (6.4.2)
100+
psych (5.2.1)
101+
date
102+
stringio
103+
puma (6.4.3)
98104
nio4r (~> 2.0)
99105
raabro (1.4.0)
100-
racc (1.8.0)
101-
rack (3.1.5)
106+
racc (1.8.1)
107+
rack (3.1.8)
102108
rack-session (2.0.0)
103109
rack (>= 3.0.0)
104110
rack-test (2.1.0)
105111
rack (>= 1.3)
106-
rackup (2.1.0)
112+
rackup (2.2.1)
107113
rack (>= 3)
108-
webrick (~> 1.8)
109114
rails-dom-testing (2.2.0)
110115
activesupport (>= 5.0.0)
111116
minitest
112117
nokogiri (>= 1.6)
113118
rails-html-sanitizer (1.6.0)
114119
loofah (~> 2.21)
115120
nokogiri (~> 1.14)
116-
railties (7.1.3.4)
117-
actionpack (= 7.1.3.4)
118-
activesupport (= 7.1.3.4)
121+
railties (7.1.4.1)
122+
actionpack (= 7.1.4.1)
123+
activesupport (= 7.1.4.1)
119124
irb
120125
rackup (>= 1.0.0)
121126
rake (>= 12.2)
122127
thor (~> 1.0, >= 1.2.2)
123128
zeitwerk (~> 2.6)
124129
rainbow (3.1.1)
125-
rake (13.0.6)
126-
regexp_parser (2.9.0)
127-
reline (0.3.2)
130+
rake (13.2.1)
131+
rdoc (6.8.1)
132+
psych (>= 4.0.0)
133+
regexp_parser (2.9.2)
134+
reline (0.5.12)
128135
io-console (~> 0.5)
129-
rexml (3.3.6)
130-
strscan
131-
rubocop (1.62.1)
136+
rubocop (1.69.0)
132137
json (~> 2.3)
133138
language_server-protocol (>= 3.17.0)
134139
parallel (~> 1.10)
135140
parser (>= 3.3.0.2)
136141
rainbow (>= 2.2.2, < 4.0)
137-
regexp_parser (>= 1.8, < 3.0)
138-
rexml (>= 3.2.5, < 4.0)
139-
rubocop-ast (>= 1.31.1, < 2.0)
142+
regexp_parser (>= 2.4, < 3.0)
143+
rubocop-ast (>= 1.36.1, < 2.0)
140144
ruby-progressbar (~> 1.7)
141-
unicode-display_width (>= 2.4.0, < 3.0)
142-
rubocop-ast (1.31.2)
143-
parser (>= 3.3.0.4)
144-
rubocop-minitest (0.35.0)
145+
unicode-display_width (>= 2.4.0, < 4.0)
146+
rubocop-ast (1.36.2)
147+
parser (>= 3.3.1.0)
148+
rubocop-minitest (0.36.0)
145149
rubocop (>= 1.61, < 2.0)
146150
rubocop-ast (>= 1.31.1, < 2.0)
147-
rubocop-performance (1.21.0)
151+
rubocop-performance (1.23.0)
148152
rubocop (>= 1.48.1, < 2.0)
149153
rubocop-ast (>= 1.31.1, < 2.0)
150-
rubocop-rails (2.24.1)
154+
rubocop-rails (2.27.0)
151155
activesupport (>= 4.2.0)
152156
rack (>= 1.1)
153-
rubocop (>= 1.33.0, < 2.0)
157+
rubocop (>= 1.52.0, < 2.0)
154158
rubocop-ast (>= 1.31.1, < 2.0)
155159
rubocop-rails-omakase (1.0.0)
156160
rubocop
@@ -161,28 +165,32 @@ GEM
161165
ruby2_keywords (0.0.5)
162166
sqlite3 (1.5.4)
163167
mini_portile2 (~> 2.8.0)
164-
strscan (3.1.0)
165-
thor (1.3.1)
166-
timeout (0.4.1)
168+
stringio (3.1.2)
169+
thor (1.3.2)
170+
timeout (0.4.2)
167171
tzinfo (2.0.6)
168172
concurrent-ruby (~> 1.0)
169-
unicode-display_width (2.5.0)
170-
webrick (1.8.1)
171-
zeitwerk (2.6.12)
173+
unicode-display_width (3.1.2)
174+
unicode-emoji (~> 4.0, >= 4.0.4)
175+
unicode-emoji (4.0.4)
176+
zeitwerk (2.7.1)
172177

173178
PLATFORMS
174179
arm64-darwin-22
175180
arm64-darwin-23
181+
arm64-darwin-24
176182
x86_64-darwin-21
177183
x86_64-darwin-23
178184
x86_64-linux
179185

180186
DEPENDENCIES
181-
debug
187+
debug (~> 1.9)
188+
logger
182189
mocha
183190
mysql2
184191
pg
185192
puma
193+
rdoc
186194
rubocop-rails-omakase
187195
solid_queue!
188196
sqlite3

0 commit comments

Comments
 (0)