Skip to content

Commit 5468a72

Browse files
committed
Merge remote-tracking branch 'origin/master' into gns/omakase
2 parents ac56f6c + 9be91c8 commit 5468a72

File tree

5 files changed

+99
-96
lines changed

5 files changed

+99
-96
lines changed

.github/workflows/pipeline.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
- ruby: 3.0.6
3232
rails: 7.2.1
3333
- ruby: 2.7.5
34-
rails: 8.0.0
34+
rails: 8.0.2
3535
- ruby: 3.0.6
36-
rails: 8.0.0
36+
rails: 8.0.2
3737
- ruby: 3.1.4
38-
rails: 8.0.0
38+
rails: 8.0.2
3939
env:
4040
RAILS_VERSION: ${{ matrix.rails }}
4141
CUSTOM_RUBY_VERSION: ${{ matrix.ruby }}

.rails-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.0
1+
8.0.2

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RAILS_VERSION = Gem::Version.new(
1515
)
1616

1717
gem "puma"
18-
gem "rails", "~> #{RAILS_VERSION}"
18+
gem "rails", RAILS_VERSION
1919
gem "rake"
2020
gem "sqlite3", RAILS_VERSION >= Gem::Version.new("8") ? ">= 2" : "~> 1.4"
2121

Gemfile.lock

Lines changed: 90 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -7,65 +7,65 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
actioncable (8.0.1)
11-
actionpack (= 8.0.1)
12-
activesupport (= 8.0.1)
10+
actioncable (8.0.2)
11+
actionpack (= 8.0.2)
12+
activesupport (= 8.0.2)
1313
nio4r (~> 2.0)
1414
websocket-driver (>= 0.6.1)
1515
zeitwerk (~> 2.6)
16-
actionmailbox (8.0.1)
17-
actionpack (= 8.0.1)
18-
activejob (= 8.0.1)
19-
activerecord (= 8.0.1)
20-
activestorage (= 8.0.1)
21-
activesupport (= 8.0.1)
16+
actionmailbox (8.0.2)
17+
actionpack (= 8.0.2)
18+
activejob (= 8.0.2)
19+
activerecord (= 8.0.2)
20+
activestorage (= 8.0.2)
21+
activesupport (= 8.0.2)
2222
mail (>= 2.8.0)
23-
actionmailer (8.0.1)
24-
actionpack (= 8.0.1)
25-
actionview (= 8.0.1)
26-
activejob (= 8.0.1)
27-
activesupport (= 8.0.1)
23+
actionmailer (8.0.2)
24+
actionpack (= 8.0.2)
25+
actionview (= 8.0.2)
26+
activejob (= 8.0.2)
27+
activesupport (= 8.0.2)
2828
mail (>= 2.8.0)
2929
rails-dom-testing (~> 2.2)
30-
actionpack (8.0.1)
31-
actionview (= 8.0.1)
32-
activesupport (= 8.0.1)
30+
actionpack (8.0.2)
31+
actionview (= 8.0.2)
32+
activesupport (= 8.0.2)
3333
nokogiri (>= 1.8.5)
3434
rack (>= 2.2.4)
3535
rack-session (>= 1.0.1)
3636
rack-test (>= 0.6.3)
3737
rails-dom-testing (~> 2.2)
3838
rails-html-sanitizer (~> 1.6)
3939
useragent (~> 0.16)
40-
actiontext (8.0.1)
41-
actionpack (= 8.0.1)
42-
activerecord (= 8.0.1)
43-
activestorage (= 8.0.1)
44-
activesupport (= 8.0.1)
40+
actiontext (8.0.2)
41+
actionpack (= 8.0.2)
42+
activerecord (= 8.0.2)
43+
activestorage (= 8.0.2)
44+
activesupport (= 8.0.2)
4545
globalid (>= 0.6.0)
4646
nokogiri (>= 1.8.5)
47-
actionview (8.0.1)
48-
activesupport (= 8.0.1)
47+
actionview (8.0.2)
48+
activesupport (= 8.0.2)
4949
builder (~> 3.1)
5050
erubi (~> 1.11)
5151
rails-dom-testing (~> 2.2)
5252
rails-html-sanitizer (~> 1.6)
53-
activejob (8.0.1)
54-
activesupport (= 8.0.1)
53+
activejob (8.0.2)
54+
activesupport (= 8.0.2)
5555
globalid (>= 0.3.6)
56-
activemodel (8.0.1)
57-
activesupport (= 8.0.1)
58-
activerecord (8.0.1)
59-
activemodel (= 8.0.1)
60-
activesupport (= 8.0.1)
56+
activemodel (8.0.2)
57+
activesupport (= 8.0.2)
58+
activerecord (8.0.2)
59+
activemodel (= 8.0.2)
60+
activesupport (= 8.0.2)
6161
timeout (>= 0.4.0)
62-
activestorage (8.0.1)
63-
actionpack (= 8.0.1)
64-
activejob (= 8.0.1)
65-
activerecord (= 8.0.1)
66-
activesupport (= 8.0.1)
62+
activestorage (8.0.2)
63+
actionpack (= 8.0.2)
64+
activejob (= 8.0.2)
65+
activerecord (= 8.0.2)
66+
activesupport (= 8.0.2)
6767
marcel (~> 1.0)
68-
activesupport (8.0.1)
68+
activesupport (8.0.2)
6969
base64
7070
benchmark (>= 0.3)
7171
bigdecimal
@@ -93,21 +93,21 @@ GEM
9393
binding_of_caller (1.0.1)
9494
debug_inspector (>= 1.2.0)
9595
builder (3.3.0)
96-
byebug (11.1.3)
96+
byebug (12.0.0)
9797
cloudflare-rails (6.2.0)
9898
actionpack (>= 7.1.0, < 8.1.0)
9999
activesupport (>= 7.1.0, < 8.1.0)
100100
railties (>= 7.1.0, < 8.1.0)
101101
zeitwerk (>= 2.5.0)
102102
coderay (1.1.3)
103103
concurrent-ruby (1.3.5)
104-
connection_pool (2.5.0)
104+
connection_pool (2.5.3)
105105
crass (1.0.6)
106-
csv (3.3.2)
106+
csv (3.3.4)
107107
date (3.4.1)
108108
debug_inspector (1.2.0)
109109
docile (1.4.1)
110-
dotenv (3.1.7)
110+
dotenv (3.1.8)
111111
drb (2.2.1)
112112
ed25519 (1.3.0)
113113
erubi (1.13.1)
@@ -121,19 +121,19 @@ GEM
121121
raabro (~> 1.4)
122122
globalid (1.2.1)
123123
activesupport (>= 6.1)
124-
httparty (0.22.0)
124+
httparty (0.23.1)
125125
csv
126126
mini_mime (>= 1.0.0)
127127
multi_xml (>= 0.5.2)
128128
i18n (1.14.7)
129129
concurrent-ruby (~> 1.0)
130130
io-console (0.8.0)
131-
irb (1.15.1)
131+
irb (1.15.2)
132132
pp (>= 0.6.0)
133133
rdoc (>= 4.0.0)
134134
reline (>= 0.4.2)
135-
json (2.11.2)
136-
kamal (2.4.0)
135+
json (2.11.3)
136+
kamal (2.5.3)
137137
activesupport (>= 7.0)
138138
base64 (~> 0.2)
139139
bcrypt_pbkdf (~> 1.0)
@@ -150,7 +150,7 @@ GEM
150150
kramdown (~> 2.0)
151151
language_server-protocol (3.17.0.4)
152152
lint_roller (1.1.0)
153-
logger (1.6.5)
153+
logger (1.7.0)
154154
loofah (2.24.0)
155155
crass (~> 1.0.2)
156156
nokogiri (>= 1.12.0)
@@ -162,10 +162,10 @@ GEM
162162
marcel (1.0.4)
163163
method_source (1.1.0)
164164
mini_mime (1.1.5)
165-
minitest (5.25.4)
166-
multi_xml (0.7.1)
165+
minitest (5.25.5)
166+
multi_xml (0.7.2)
167167
bigdecimal (~> 3.1)
168-
net-imap (0.5.5)
168+
net-imap (0.5.8)
169169
date
170170
net-protocol
171171
net-pop (0.1.2)
@@ -176,15 +176,15 @@ GEM
176176
net-ssh (>= 2.6.5, < 8.0.0)
177177
net-sftp (4.0.0)
178178
net-ssh (>= 5.0.0, < 8.0.0)
179-
net-smtp (0.5.0)
179+
net-smtp (0.5.1)
180180
net-protocol
181181
net-ssh (7.3.0)
182182
nio4r (2.7.4)
183-
nokogiri (1.18.2-arm64-darwin)
183+
nokogiri (1.18.8-arm64-darwin)
184184
racc (~> 1.4)
185-
nokogiri (1.18.2-x86_64-darwin)
185+
nokogiri (1.18.8-x86_64-darwin)
186186
racc (~> 1.4)
187-
nokogiri (1.18.2-x86_64-linux-gnu)
187+
nokogiri (1.18.8-x86_64-linux-gnu)
188188
racc (~> 1.4)
189189
ostruct (0.6.1)
190190
parallel (1.27.0)
@@ -205,14 +205,14 @@ GEM
205205
method_source (~> 1.0)
206206
pry-rails (0.3.11)
207207
pry (>= 0.13.0)
208-
psych (5.2.3)
208+
psych (5.2.4)
209209
date
210210
stringio
211-
puma (6.5.0)
211+
puma (6.6.0)
212212
nio4r (~> 2.0)
213213
raabro (1.4.0)
214214
racc (1.8.1)
215-
rack (3.1.8)
215+
rack (3.1.13)
216216
rack-cors (2.0.2)
217217
rack (>= 2.0.0)
218218
rack-mini-profiler (3.3.1)
@@ -224,49 +224,49 @@ GEM
224224
rack (>= 1.3)
225225
rackup (2.2.1)
226226
rack (>= 3)
227-
rails (8.0.1)
228-
actioncable (= 8.0.1)
229-
actionmailbox (= 8.0.1)
230-
actionmailer (= 8.0.1)
231-
actionpack (= 8.0.1)
232-
actiontext (= 8.0.1)
233-
actionview (= 8.0.1)
234-
activejob (= 8.0.1)
235-
activemodel (= 8.0.1)
236-
activerecord (= 8.0.1)
237-
activestorage (= 8.0.1)
238-
activesupport (= 8.0.1)
227+
rails (8.0.2)
228+
actioncable (= 8.0.2)
229+
actionmailbox (= 8.0.2)
230+
actionmailer (= 8.0.2)
231+
actionpack (= 8.0.2)
232+
actiontext (= 8.0.2)
233+
actionview (= 8.0.2)
234+
activejob (= 8.0.2)
235+
activemodel (= 8.0.2)
236+
activerecord (= 8.0.2)
237+
activestorage (= 8.0.2)
238+
activesupport (= 8.0.2)
239239
bundler (>= 1.15.0)
240-
railties (= 8.0.1)
240+
railties (= 8.0.2)
241241
rails-dom-testing (2.2.0)
242242
activesupport (>= 5.0.0)
243243
minitest
244244
nokogiri (>= 1.6)
245245
rails-html-sanitizer (1.6.2)
246246
loofah (~> 2.21)
247247
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)
248-
railties (8.0.1)
249-
actionpack (= 8.0.1)
250-
activesupport (= 8.0.1)
248+
railties (8.0.2)
249+
actionpack (= 8.0.2)
250+
activesupport (= 8.0.2)
251251
irb (~> 1.13)
252252
rackup (>= 1.0.0)
253253
rake (>= 12.2)
254254
thor (~> 1.0, >= 1.2.2)
255255
zeitwerk (~> 2.6)
256256
rainbow (3.1.1)
257257
rake (13.2.1)
258-
ransack (4.2.1)
258+
ransack (4.3.0)
259259
activerecord (>= 6.1.5)
260260
activesupport (>= 6.1.5)
261261
i18n
262262
rbs (3.9.2)
263263
logger
264-
rdoc (6.11.0)
264+
rdoc (6.13.1)
265265
psych (>= 4.0.0)
266266
regexp_parser (2.10.0)
267-
reline (0.6.0)
267+
reline (0.6.1)
268268
io-console (~> 0.5)
269-
rexml (3.4.0)
269+
rexml (3.4.1)
270270
rubocop (1.75.4)
271271
json (~> 2.3)
272272
language_server-protocol (~> 3.17.0.2)
@@ -302,10 +302,10 @@ GEM
302302
sorbet-runtime (>= 0.5.10782)
303303
ruby-progressbar (1.13.0)
304304
securerandom (0.4.1)
305-
sentry-rails (5.22.2)
305+
sentry-rails (5.23.0)
306306
railties (>= 5.0)
307-
sentry-ruby (~> 5.22.2)
308-
sentry-ruby (5.22.2)
307+
sentry-ruby (~> 5.23.0)
308+
sentry-ruby (5.23.0)
309309
bigdecimal
310310
concurrent-ruby (~> 1.0, >= 1.0.2)
311311
simplecov (0.22.0)
@@ -315,25 +315,26 @@ GEM
315315
simplecov-html (0.13.1)
316316
simplecov-lcov (0.8.0)
317317
simplecov_json_formatter (0.1.4)
318-
solid_queue (1.1.3)
318+
solid_queue (1.1.5)
319319
activejob (>= 7.1)
320320
activerecord (>= 7.1)
321321
concurrent-ruby (>= 1.3.1)
322322
fugit (~> 1.11.0)
323323
railties (>= 7.1)
324324
thor (~> 1.3.1)
325-
sorbet-runtime (0.5.12032)
326-
sqlite3 (2.5.0-arm64-darwin)
327-
sqlite3 (2.5.0-x86_64-darwin)
328-
sqlite3 (2.5.0-x86_64-linux-gnu)
329-
sshkit (1.23.2)
325+
sorbet-runtime (0.5.12053)
326+
sqlite3 (2.6.0-arm64-darwin)
327+
sqlite3 (2.6.0-x86_64-darwin)
328+
sqlite3 (2.6.0-x86_64-linux-gnu)
329+
sshkit (1.24.0)
330330
base64
331+
logger
331332
net-scp (>= 1.1.2)
332333
net-sftp (>= 2.1.2)
333334
net-ssh (>= 2.8.0)
334335
ostruct
335336
stackprof (0.2.27)
336-
stringio (3.1.2)
337+
stringio (3.1.7)
337338
thor (1.3.2)
338339
timeout (0.4.3)
339340
translate_enum (0.2.0)
@@ -343,7 +344,7 @@ GEM
343344
unicode-display_width (3.1.4)
344345
unicode-emoji (~> 4.0, >= 4.0.4)
345346
unicode-emoji (4.0.4)
346-
uri (1.0.2)
347+
uri (1.0.3)
347348
useragent (0.16.11)
348349
web-console (4.2.1)
349350
actionview (>= 6.0.0)
@@ -354,7 +355,7 @@ GEM
354355
base64
355356
websocket-extensions (>= 0.1.0)
356357
websocket-extensions (0.1.5)
357-
zeitwerk (2.7.1)
358+
zeitwerk (2.7.2)
358359

359360
PLATFORMS
360361
arm64-darwin-23
@@ -379,7 +380,7 @@ DEPENDENCIES
379380
puma
380381
rack-cors
381382
rack-mini-profiler
382-
rails (~> 8.0.0)
383+
rails (= 8.0.2)
383384
rake
384385
ransack (>= 4.0)
385386
rest_framework!

bin/rubocop

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ if File.file?(bundle_binstub)
1616
if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
1717
load(bundle_binstub)
1818
else
19-
abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
20-
Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
19+
abort(<<~TXT)
20+
Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. Replace
21+
`bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.
22+
TXT
2123
end
2224
end
2325

0 commit comments

Comments
 (0)