Skip to content

Commit 3c0cf9b

Browse files
Merge pull request #427 from rubygems/dependabot/bundler/rails-8.1.3
Bump rails from 8.0.4.1 to 8.1.3
2 parents 044de62 + 4aaacaa commit 3c0cf9b

File tree

10 files changed

+350
-104
lines changed

10 files changed

+350
-104
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
env:
1616
DB_HOST: 127.0.0.1
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1919

2020
- name: Install and start services
2121
run: docker compose up -d --wait

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22

33
ruby file: ".ruby-version"
44

5-
gem 'rails', '~> 8.0.4'
5+
gem 'rails', '~> 8.1.3'
66
gem 'mysql2'
77
gem 'puma', '~> 7.2'
88
gem 'bootsnap', '>= 1.4.2', require: false

Gemfile.lock

Lines changed: 61 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,80 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (8.0.4.1)
5-
actionpack (= 8.0.4.1)
6-
activesupport (= 8.0.4.1)
4+
action_text-trix (2.1.18)
5+
railties
6+
actioncable (8.1.3)
7+
actionpack (= 8.1.3)
8+
activesupport (= 8.1.3)
79
nio4r (~> 2.0)
810
websocket-driver (>= 0.6.1)
911
zeitwerk (~> 2.6)
10-
actionmailbox (8.0.4.1)
11-
actionpack (= 8.0.4.1)
12-
activejob (= 8.0.4.1)
13-
activerecord (= 8.0.4.1)
14-
activestorage (= 8.0.4.1)
15-
activesupport (= 8.0.4.1)
12+
actionmailbox (8.1.3)
13+
actionpack (= 8.1.3)
14+
activejob (= 8.1.3)
15+
activerecord (= 8.1.3)
16+
activestorage (= 8.1.3)
17+
activesupport (= 8.1.3)
1618
mail (>= 2.8.0)
17-
actionmailer (8.0.4.1)
18-
actionpack (= 8.0.4.1)
19-
actionview (= 8.0.4.1)
20-
activejob (= 8.0.4.1)
21-
activesupport (= 8.0.4.1)
19+
actionmailer (8.1.3)
20+
actionpack (= 8.1.3)
21+
actionview (= 8.1.3)
22+
activejob (= 8.1.3)
23+
activesupport (= 8.1.3)
2224
mail (>= 2.8.0)
2325
rails-dom-testing (~> 2.2)
24-
actionpack (8.0.4.1)
25-
actionview (= 8.0.4.1)
26-
activesupport (= 8.0.4.1)
26+
actionpack (8.1.3)
27+
actionview (= 8.1.3)
28+
activesupport (= 8.1.3)
2729
nokogiri (>= 1.8.5)
2830
rack (>= 2.2.4)
2931
rack-session (>= 1.0.1)
3032
rack-test (>= 0.6.3)
3133
rails-dom-testing (~> 2.2)
3234
rails-html-sanitizer (~> 1.6)
3335
useragent (~> 0.16)
34-
actiontext (8.0.4.1)
35-
actionpack (= 8.0.4.1)
36-
activerecord (= 8.0.4.1)
37-
activestorage (= 8.0.4.1)
38-
activesupport (= 8.0.4.1)
36+
actiontext (8.1.3)
37+
action_text-trix (~> 2.1.15)
38+
actionpack (= 8.1.3)
39+
activerecord (= 8.1.3)
40+
activestorage (= 8.1.3)
41+
activesupport (= 8.1.3)
3942
globalid (>= 0.6.0)
4043
nokogiri (>= 1.8.5)
41-
actionview (8.0.4.1)
42-
activesupport (= 8.0.4.1)
44+
actionview (8.1.3)
45+
activesupport (= 8.1.3)
4346
builder (~> 3.1)
4447
erubi (~> 1.11)
4548
rails-dom-testing (~> 2.2)
4649
rails-html-sanitizer (~> 1.6)
4750
active_model_serializers (0.9.13)
4851
activemodel (>= 3.2)
4952
concurrent-ruby (~> 1.0)
50-
activejob (8.0.4.1)
51-
activesupport (= 8.0.4.1)
53+
activejob (8.1.3)
54+
activesupport (= 8.1.3)
5255
globalid (>= 0.3.6)
53-
activemodel (8.0.4.1)
54-
activesupport (= 8.0.4.1)
55-
activerecord (8.0.4.1)
56-
activemodel (= 8.0.4.1)
57-
activesupport (= 8.0.4.1)
56+
activemodel (8.1.3)
57+
activesupport (= 8.1.3)
58+
activerecord (8.1.3)
59+
activemodel (= 8.1.3)
60+
activesupport (= 8.1.3)
5861
timeout (>= 0.4.0)
59-
activestorage (8.0.4.1)
60-
actionpack (= 8.0.4.1)
61-
activejob (= 8.0.4.1)
62-
activerecord (= 8.0.4.1)
63-
activesupport (= 8.0.4.1)
62+
activestorage (8.1.3)
63+
actionpack (= 8.1.3)
64+
activejob (= 8.1.3)
65+
activerecord (= 8.1.3)
66+
activesupport (= 8.1.3)
6467
marcel (~> 1.0)
65-
activesupport (8.0.4.1)
68+
activesupport (8.1.3)
6669
base64
67-
benchmark (>= 0.3)
6870
bigdecimal
6971
concurrent-ruby (~> 1.0, >= 1.3.1)
7072
connection_pool (>= 2.2.5)
7173
drb
7274
i18n (>= 1.6, < 2)
75+
json
7376
logger (>= 1.4.2)
74-
minitest (>= 5.1, < 6)
77+
minitest (>= 5.1)
7578
securerandom (>= 0.3)
7679
tzinfo (~> 2.0, >= 2.0.5)
7780
uri (>= 0.13.1)
@@ -85,7 +88,6 @@ GEM
8588
ice_nine (~> 0.11.0)
8689
thread_safe (~> 0.3, >= 0.3.1)
8790
base64 (0.3.0)
88-
benchmark (0.5.0)
8991
bigdecimal (4.0.1)
9092
bindex (0.8.1)
9193
bootsnap (1.23.0)
@@ -262,20 +264,20 @@ GEM
262264
rackup (1.0.1)
263265
rack (< 3)
264266
webrick
265-
rails (8.0.4.1)
266-
actioncable (= 8.0.4.1)
267-
actionmailbox (= 8.0.4.1)
268-
actionmailer (= 8.0.4.1)
269-
actionpack (= 8.0.4.1)
270-
actiontext (= 8.0.4.1)
271-
actionview (= 8.0.4.1)
272-
activejob (= 8.0.4.1)
273-
activemodel (= 8.0.4.1)
274-
activerecord (= 8.0.4.1)
275-
activestorage (= 8.0.4.1)
276-
activesupport (= 8.0.4.1)
267+
rails (8.1.3)
268+
actioncable (= 8.1.3)
269+
actionmailbox (= 8.1.3)
270+
actionmailer (= 8.1.3)
271+
actionpack (= 8.1.3)
272+
actiontext (= 8.1.3)
273+
actionview (= 8.1.3)
274+
activejob (= 8.1.3)
275+
activemodel (= 8.1.3)
276+
activerecord (= 8.1.3)
277+
activestorage (= 8.1.3)
278+
activesupport (= 8.1.3)
277279
bundler (>= 1.15.0)
278-
railties (= 8.0.4.1)
280+
railties (= 8.1.3)
279281
rails-dom-testing (2.3.0)
280282
activesupport (>= 5.0.0)
281283
minitest
@@ -290,9 +292,9 @@ GEM
290292
actionview (> 3.1)
291293
activesupport (> 3.1)
292294
railties (> 3.1)
293-
railties (8.0.4.1)
294-
actionpack (= 8.0.4.1)
295-
activesupport (= 8.0.4.1)
295+
railties (8.1.3)
296+
actionpack (= 8.1.3)
297+
activesupport (= 8.1.3)
296298
irb (~> 1.13)
297299
rackup (>= 1.0.0)
298300
rake (>= 12.2)
@@ -319,22 +321,12 @@ GEM
319321
railties (>= 7.0)
320322
ruby2_keywords (0.0.5)
321323
safe_yaml (1.0.5)
322-
sass-rails (6.0.0)
323-
sassc-rails (~> 2.1, >= 2.1.1)
324-
sassc (2.4.0)
325-
ffi (~> 1.9)
326-
sassc-rails (2.1.2)
327-
railties (>= 4.0.0)
328-
sassc (>= 2.0)
329-
sprockets (> 3.0)
330-
sprockets-rails
331-
tilt
332324
sawyer (0.9.3)
333325
addressable (>= 2.3.5)
334326
faraday (>= 0.17.3, < 3)
335327
securecompare (1.0.0)
336328
securerandom (0.4.1)
337-
shipit-engine (0.44.2)
329+
shipit-engine (0.45.1)
338330
active_model_serializers (~> 0.9.3)
339331
ansi_stream (~> 0.0.6)
340332
autoprefixer-rails (~> 6.4.1)
@@ -349,14 +341,13 @@ GEM
349341
omniauth-github (~> 1.4)
350342
paquito
351343
pubsubstub (~> 0.2)
352-
rails (~> 8.0.1)
344+
rails (>= 8.1.1)
353345
rails-timeago (~> 2.13.0)
354346
rails_autolink (~> 1.1.6)
355347
rake
356348
redis-objects (~> 1.5)
357349
responders (~> 3.0)
358350
safe_yaml (~> 1.0.4)
359-
sass-rails (>= 5.0)
360351
securecompare (~> 1.0.0)
361352
sprockets (< 4)
362353
sprockets-rails (>= 2.3.2)
@@ -389,7 +380,6 @@ GEM
389380
stringio (3.2.0)
390381
thor (1.5.0)
391382
thread_safe (0.3.6)
392-
tilt (2.7.0)
393383
timeout (0.6.1)
394384
tsort (0.2.0)
395385
tzinfo (2.0.6)
@@ -438,7 +428,7 @@ DEPENDENCIES
438428
mysql2
439429
ostruct
440430
puma (~> 7.2)
441-
rails (~> 8.0.4)
431+
rails (~> 8.1.3)
442432
shipit-engine (>= 0.36.0)
443433
sidekiq
444434
web-console (>= 3.3.0)

bin/ci

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env ruby
2+
require_relative "../config/boot"
3+
require "active_support/continuous_integration"
4+
5+
CI = ActiveSupport::ContinuousIntegration
6+
require_relative "../config/ci.rb"

bin/dev

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env ruby
2+
exec "./bin/rails", "server", *ARGV

config/application.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
require "action_view/railtie"
1414
# require "action_cable/engine"
1515
require "rails/test_unit/railtie"
16+
require "sprockets/railtie"
1617

1718
# Require the gems listed in Gemfile, including any gems
1819
# you've limited to :test, :development, or :production.
@@ -21,7 +22,7 @@
2122
module Shipit
2223
class Application < Rails::Application
2324
# Initialize configuration defaults for originally generated Rails version.
24-
config.load_defaults 8.0
25+
config.load_defaults 8.1
2526

2627
config.active_job.queue_adapter = :sidekiq
2728

config/ci.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Run using bin/ci
2+
3+
CI.run do
4+
step "Setup", "bin/setup --skip-server"
5+
6+
step "Tests: Rails", "bin/rails test"
7+
end

config/initializers/new_framework_defaults_8_0.rb

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)