Skip to content

Commit 67248ad

Browse files
authored
Merge pull request #11030 from neinteractiveliterature/renovate/ruby-on-rails-packages
Update dependency rails to v8.1.1
2 parents ff21c43 + 0f1b06b commit 67248ad

File tree

18 files changed

+950
-767
lines changed

18 files changed

+950
-767
lines changed

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.21.1
1+
24.11.1

.yarn/releases/yarn-4.11.0.cjs renamed to .yarn/releases/yarn-4.12.0.cjs

Lines changed: 191 additions & 191 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ packageExtensions:
1111

1212
pnpEnableEsmLoader: true
1313

14-
yarnPath: .yarn/releases/yarn-4.11.0.cjs
14+
yarnPath: .yarn/releases/yarn-4.12.0.cjs

Gemfile

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

33
ruby File.read(File.expand_path(".ruby-version", __dir__)).strip
4-
gem "rails", "8.0.3"
4+
gem "rails", "8.1.1"
55

66
gem "pg"
77
gem "puma"

Gemfile.lock

Lines changed: 63 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -28,80 +28,83 @@ GIT
2828
GEM
2929
remote: https://rubygems.org/
3030
specs:
31-
actioncable (8.0.3)
32-
actionpack (= 8.0.3)
33-
activesupport (= 8.0.3)
31+
action_text-trix (2.1.15)
32+
railties
33+
actioncable (8.1.1)
34+
actionpack (= 8.1.1)
35+
activesupport (= 8.1.1)
3436
nio4r (~> 2.0)
3537
websocket-driver (>= 0.6.1)
3638
zeitwerk (~> 2.6)
37-
actionmailbox (8.0.3)
38-
actionpack (= 8.0.3)
39-
activejob (= 8.0.3)
40-
activerecord (= 8.0.3)
41-
activestorage (= 8.0.3)
42-
activesupport (= 8.0.3)
39+
actionmailbox (8.1.1)
40+
actionpack (= 8.1.1)
41+
activejob (= 8.1.1)
42+
activerecord (= 8.1.1)
43+
activestorage (= 8.1.1)
44+
activesupport (= 8.1.1)
4345
mail (>= 2.8.0)
44-
actionmailer (8.0.3)
45-
actionpack (= 8.0.3)
46-
actionview (= 8.0.3)
47-
activejob (= 8.0.3)
48-
activesupport (= 8.0.3)
46+
actionmailer (8.1.1)
47+
actionpack (= 8.1.1)
48+
actionview (= 8.1.1)
49+
activejob (= 8.1.1)
50+
activesupport (= 8.1.1)
4951
mail (>= 2.8.0)
5052
rails-dom-testing (~> 2.2)
51-
actionpack (8.0.3)
52-
actionview (= 8.0.3)
53-
activesupport (= 8.0.3)
53+
actionpack (8.1.1)
54+
actionview (= 8.1.1)
55+
activesupport (= 8.1.1)
5456
nokogiri (>= 1.8.5)
5557
rack (>= 2.2.4)
5658
rack-session (>= 1.0.1)
5759
rack-test (>= 0.6.3)
5860
rails-dom-testing (~> 2.2)
5961
rails-html-sanitizer (~> 1.6)
6062
useragent (~> 0.16)
61-
actiontext (8.0.3)
62-
actionpack (= 8.0.3)
63-
activerecord (= 8.0.3)
64-
activestorage (= 8.0.3)
65-
activesupport (= 8.0.3)
63+
actiontext (8.1.1)
64+
action_text-trix (~> 2.1.15)
65+
actionpack (= 8.1.1)
66+
activerecord (= 8.1.1)
67+
activestorage (= 8.1.1)
68+
activesupport (= 8.1.1)
6669
globalid (>= 0.6.0)
6770
nokogiri (>= 1.8.5)
68-
actionview (8.0.3)
69-
activesupport (= 8.0.3)
71+
actionview (8.1.1)
72+
activesupport (= 8.1.1)
7073
builder (~> 3.1)
7174
erubi (~> 1.11)
7275
rails-dom-testing (~> 2.2)
7376
rails-html-sanitizer (~> 1.6)
7477
active_storage_svg_sanitizer (0.1.0)
7578
rails (>= 5.2)
76-
activejob (8.0.3)
77-
activesupport (= 8.0.3)
79+
activejob (8.1.1)
80+
activesupport (= 8.1.1)
7881
globalid (>= 0.3.6)
79-
activemodel (8.0.3)
80-
activesupport (= 8.0.3)
81-
activerecord (8.0.3)
82-
activemodel (= 8.0.3)
83-
activesupport (= 8.0.3)
82+
activemodel (8.1.1)
83+
activesupport (= 8.1.1)
84+
activerecord (8.1.1)
85+
activemodel (= 8.1.1)
86+
activesupport (= 8.1.1)
8487
timeout (>= 0.4.0)
8588
activerecord-session_store (2.2.0)
8689
actionpack (>= 7.0)
8790
activerecord (>= 7.0)
8891
cgi (>= 0.3.6)
8992
rack (>= 2.0.8, < 4)
9093
railties (>= 7.0)
91-
activestorage (8.0.3)
92-
actionpack (= 8.0.3)
93-
activejob (= 8.0.3)
94-
activerecord (= 8.0.3)
95-
activesupport (= 8.0.3)
94+
activestorage (8.1.1)
95+
actionpack (= 8.1.1)
96+
activejob (= 8.1.1)
97+
activerecord (= 8.1.1)
98+
activesupport (= 8.1.1)
9699
marcel (~> 1.0)
97-
activesupport (8.0.3)
100+
activesupport (8.1.1)
98101
base64
99-
benchmark (>= 0.3)
100102
bigdecimal
101103
concurrent-ruby (~> 1.0, >= 1.3.1)
102104
connection_pool (>= 2.2.5)
103105
drb
104106
i18n (>= 1.6, < 2)
107+
json
105108
logger (>= 1.4.2)
106109
minitest (>= 5.1)
107110
securerandom (>= 0.3)
@@ -164,7 +167,6 @@ GEM
164167
aws-eventstream (~> 1, >= 1.0.2)
165168
base64 (0.3.0)
166169
bcrypt (3.1.20)
167-
benchmark (0.5.0)
168170
benchmark-ips (2.14.0)
169171
bigdecimal (3.3.1)
170172
bootsnap (1.19.0)
@@ -269,7 +271,7 @@ GEM
269271
toml
270272
get_process_mem (0.2.7)
271273
ffi (~> 1.0)
272-
globalid (1.2.1)
274+
globalid (1.3.0)
273275
activesupport (>= 6.1)
274276
graphql (2.2.17)
275277
base64
@@ -329,12 +331,13 @@ GEM
329331
loofah (2.24.1)
330332
crass (~> 1.0.2)
331333
nokogiri (>= 1.12.0)
332-
mail (2.8.1)
334+
mail (2.9.0)
335+
logger
333336
mini_mime (>= 0.1.1)
334337
net-imap
335338
net-pop
336339
net-smtp
337-
marcel (1.0.4)
340+
marcel (1.1.0)
338341
memory_profiler (1.1.0)
339342
method_source (1.0.0)
340343
mini_histogram (0.3.1)
@@ -444,20 +447,20 @@ GEM
444447
rackup (1.0.1)
445448
rack (< 3)
446449
webrick
447-
rails (8.0.3)
448-
actioncable (= 8.0.3)
449-
actionmailbox (= 8.0.3)
450-
actionmailer (= 8.0.3)
451-
actionpack (= 8.0.3)
452-
actiontext (= 8.0.3)
453-
actionview (= 8.0.3)
454-
activejob (= 8.0.3)
455-
activemodel (= 8.0.3)
456-
activerecord (= 8.0.3)
457-
activestorage (= 8.0.3)
458-
activesupport (= 8.0.3)
450+
rails (8.1.1)
451+
actioncable (= 8.1.1)
452+
actionmailbox (= 8.1.1)
453+
actionmailer (= 8.1.1)
454+
actionpack (= 8.1.1)
455+
actiontext (= 8.1.1)
456+
actionview (= 8.1.1)
457+
activejob (= 8.1.1)
458+
activemodel (= 8.1.1)
459+
activerecord (= 8.1.1)
460+
activestorage (= 8.1.1)
461+
activesupport (= 8.1.1)
459462
bundler (>= 1.15.0)
460-
railties (= 8.0.3)
463+
railties (= 8.1.1)
461464
rails-controller-testing (1.0.5)
462465
actionpack (>= 5.0.1.rc1)
463466
actionview (>= 5.0.1.rc1)
@@ -469,9 +472,9 @@ GEM
469472
rails-html-sanitizer (1.6.2)
470473
loofah (~> 2.21)
471474
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)
472-
railties (8.0.3)
473-
actionpack (= 8.0.3)
474-
activesupport (= 8.0.3)
475+
railties (8.1.1)
476+
actionpack (= 8.1.1)
477+
activesupport (= 8.1.1)
475478
irb (~> 1.13)
476479
rackup (>= 1.0.0)
477480
rake (>= 12.2)
@@ -636,7 +639,7 @@ GEM
636639
warden (1.2.9)
637640
rack (>= 2.0.9)
638641
webrick (1.9.1)
639-
websocket-driver (0.7.7)
642+
websocket-driver (0.8.0)
640643
base64
641644
websocket-extensions (>= 0.1.0)
642645
websocket-extensions (0.1.5)
@@ -721,7 +724,7 @@ DEPENDENCIES
721724
puma
722725
pundit
723726
rack-mini-profiler
724-
rails (= 8.0.3)
727+
rails (= 8.1.1)
725728
rails-controller-testing
726729
rbtrace
727730
recaptcha

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"

bin/rubocop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require "rubygems"
33
require "bundler/setup"
44

5-
# explicit rubocop config increases performance slightly while avoiding config confusion.
5+
# Explicit RuboCop config increases performance slightly while avoiding config confusion.
66
ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
77

88
load Gem.bin_path("rubocop", "rubocop")

bin/setup

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ FileUtils.chdir APP_ROOT do
2222

2323
puts "\n== Preparing database =="
2424
system! "bin/rails db:prepare"
25+
system! "bin/rails db:reset" if ARGV.include?("--reset")
2526

2627
puts "\n== Removing old logs and tempfiles =="
2728
system! "bin/rails log:clear tmp:clear"

config/ci.rb

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Run using bin/ci
2+
3+
CI.run do
4+
step "Setup", "bin/setup --skip-server"
5+
6+
step "Style: Ruby", "bin/rubocop"
7+
8+
step "Security: Importmap vulnerability audit", "bin/importmap audit"
9+
10+
step "Tests: Rails", "bin/rails test"
11+
step "Tests: System", "bin/rails test:system"
12+
step "Tests: Seeds", "env RAILS_ENV=test bin/rails db:seed:replant"
13+
14+
# Optional: set a green GitHub commit status to unblock PR merge.
15+
# Requires the `gh` CLI and `gh extension install basecamp/gh-signoff`.
16+
# if success?
17+
# step "Signoff: All systems go. Ready for merge and deploy.", "gh signoff"
18+
# else
19+
# failure "Signoff: CI failed. Do not merge or deploy.", "Fix the issues and try again."
20+
# end
21+
end
Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,29 @@
11
# Be sure to restart your server when you modify this file.
22

3-
# Define an application-wide content security policy
4-
# For further information see the following documentation
5-
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
6-
7-
# Rails.application.config.content_security_policy do |policy|
8-
# policy.default_src :self, :https
9-
# policy.font_src :self, :https, :data
10-
# policy.img_src :self, :https, :data
11-
# policy.object_src :none
12-
# policy.script_src :self, :https
13-
# Allow @vite/client to hot reload javascript changes in development
14-
# policy.script_src *policy.script_src, :unsafe_eval, "http://#{ ViteRuby.config.host_with_port }" if Rails.env.development? # rubocop:disable Layout/LineLength
15-
16-
# You may need to enable this in production as well depending on your setup.
17-
# policy.script_src *policy.script_src, :blob if Rails.env.test?
18-
19-
# policy.style_src :self, :https
20-
# Allow @vite/client to hot reload style changes in development
21-
# policy.style_src *policy.style_src, :unsafe_inline if Rails.env.development?
22-
23-
# # If you are using webpack-dev-server then specify webpack-dev-server host
24-
# policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
3+
# Define an application-wide content security policy.
4+
# See the Securing Rails Applications Guide for more information:
5+
# https://guides.rubyonrails.org/security.html#content-security-policy-header
6+
7+
# Rails.application.configure do
8+
# config.content_security_policy do |policy|
9+
# policy.default_src :self, :https
10+
# policy.font_src :self, :https, :data
11+
# policy.img_src :self, :https, :data
12+
# policy.object_src :none
13+
# policy.script_src :self, :https
14+
# policy.style_src :self, :https
15+
# # Specify URI for violation reports
16+
# # policy.report_uri "/csp-violation-report-endpoint"
17+
# end
2518
#
26-
# Allow @vite/client to hot reload changes in development
27-
# policy.connect_src *policy.connect_src, "ws://#{ ViteRuby.config.host_with_port }" if Rails.env.development?
28-
29-
# # Specify URI for violation reports
30-
# # policy.report_uri "/csp-violation-report-endpoint"
19+
# # Generate session nonces for permitted importmap, inline scripts, and inline styles.
20+
# config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
21+
# config.content_security_policy_nonce_directives = %w(script-src style-src)
22+
#
23+
# # Automatically add `nonce` to `javascript_tag`, `javascript_include_tag`, and `stylesheet_link_tag`
24+
# # if the corresponding directives are specified in `content_security_policy_nonce_directives`.
25+
# # config.content_security_policy_nonce_auto = true
26+
#
27+
# # Report violations without enforcing the policy.
28+
# # config.content_security_policy_report_only = true
3129
# end
32-
33-
# If you are using UJS then enable automatic nonce generation
34-
# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
35-
36-
# Set the nonce only to specific directives
37-
# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
38-
39-
# Report CSP violations to a specified URI
40-
# For further information see the following documentation:
41-
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
42-
# Rails.application.config.content_security_policy_report_only = true

0 commit comments

Comments
 (0)