Skip to content

Commit 07c4907

Browse files
authored
dep: update Rails (#235)
and fix a logging test that started failing with rails/rails@308594b5
2 parents aaa4a34 + 2938ae9 commit 07c4907

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

Gemfile.lock

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/rails/rails.git
3-
revision: 2c76861864814ec0a95ea13a6e786cab9b2f66cd
3+
revision: def13087d55a6dbbfa80d114c847555927ce2ed7
44
branch: main
55
specs:
66
actioncable (8.2.0.alpha)
@@ -130,12 +130,12 @@ GEM
130130
concurrent-ruby (1.3.5)
131131
connection_pool (2.5.4)
132132
crass (1.0.6)
133-
date (3.4.1)
133+
date (3.5.0)
134134
debug (1.11.0)
135135
irb (~> 1.10)
136136
reline (>= 0.3.8)
137137
drb (2.2.3)
138-
erb (5.1.1)
138+
erb (5.1.3)
139139
erubi (1.13.1)
140140
et-orbi (1.4.0)
141141
tzinfo
@@ -165,7 +165,8 @@ GEM
165165
loofah (2.24.1)
166166
crass (~> 1.0.2)
167167
nokogiri (>= 1.12.0)
168-
mail (2.8.1)
168+
mail (2.9.0)
169+
logger
169170
mini_mime (>= 0.1.1)
170171
net-imap
171172
net-pop
@@ -230,7 +231,7 @@ GEM
230231
loofah (~> 2.21)
231232
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
232233
rainbow (3.1.1)
233-
rake (13.3.0)
234+
rake (13.3.1)
234235
rdoc (6.15.0)
235236
erb
236237
psych (>= 4.0.0)
@@ -313,7 +314,7 @@ GEM
313314
tailwindcss-ruby (4.1.13-x86_64-linux-gnu)
314315
tailwindcss-ruby (4.1.13-x86_64-linux-musl)
315316
thor (1.4.0)
316-
timeout (0.4.3)
317+
timeout (0.4.4)
317318
tsort (0.2.0)
318319
turbo-rails (2.0.17)
319320
actionpack (>= 7.1.0)

test/test_helper.rb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,16 @@ def with_active_storage(&block)
183183
Rails.application.config.active_record_tenanted.tenant_resolver = @old_tenant_resolver
184184
end
185185

186+
def run(...)
187+
if defined?(with_debug_event_reporting)
188+
with_debug_event_reporting do
189+
super
190+
end
191+
else
192+
super
193+
end
194+
end
195+
186196
def all_configs
187197
ActiveRecord::Base.configurations.configs_for(include_hidden: true)
188198
end

0 commit comments

Comments
 (0)