Skip to content

Commit d3d03af

Browse files
oneirosoneiros
authored
Merge pull request #143 from mastodon/update-deps
Upgrade debug provider to rails 8.1
2 parents 21de287 + c612bf4 commit d3d03af

File tree

16 files changed

+235
-89
lines changed

16 files changed

+235
-89
lines changed

‎debug_fasp/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
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
4-
gem "rails", "~> 8.0.2"
4+
gem "rails", "~> 8.1.1"
55
# The modern asset pipeline for Rails [https://github.com/rails/propshaft]
66
gem "propshaft"
77
# Use sqlite3 as the database for Active Record

‎debug_fasp/Gemfile.lock‎

Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -18,72 +18,75 @@ PATH
1818
GEM
1919
remote: https://rubygems.org/
2020
specs:
21-
actioncable (8.0.4)
22-
actionpack (= 8.0.4)
23-
activesupport (= 8.0.4)
21+
action_text-trix (2.1.15)
22+
railties
23+
actioncable (8.1.1)
24+
actionpack (= 8.1.1)
25+
activesupport (= 8.1.1)
2426
nio4r (~> 2.0)
2527
websocket-driver (>= 0.6.1)
2628
zeitwerk (~> 2.6)
27-
actionmailbox (8.0.4)
28-
actionpack (= 8.0.4)
29-
activejob (= 8.0.4)
30-
activerecord (= 8.0.4)
31-
activestorage (= 8.0.4)
32-
activesupport (= 8.0.4)
29+
actionmailbox (8.1.1)
30+
actionpack (= 8.1.1)
31+
activejob (= 8.1.1)
32+
activerecord (= 8.1.1)
33+
activestorage (= 8.1.1)
34+
activesupport (= 8.1.1)
3335
mail (>= 2.8.0)
34-
actionmailer (8.0.4)
35-
actionpack (= 8.0.4)
36-
actionview (= 8.0.4)
37-
activejob (= 8.0.4)
38-
activesupport (= 8.0.4)
36+
actionmailer (8.1.1)
37+
actionpack (= 8.1.1)
38+
actionview (= 8.1.1)
39+
activejob (= 8.1.1)
40+
activesupport (= 8.1.1)
3941
mail (>= 2.8.0)
4042
rails-dom-testing (~> 2.2)
41-
actionpack (8.0.4)
42-
actionview (= 8.0.4)
43-
activesupport (= 8.0.4)
43+
actionpack (8.1.1)
44+
actionview (= 8.1.1)
45+
activesupport (= 8.1.1)
4446
nokogiri (>= 1.8.5)
4547
rack (>= 2.2.4)
4648
rack-session (>= 1.0.1)
4749
rack-test (>= 0.6.3)
4850
rails-dom-testing (~> 2.2)
4951
rails-html-sanitizer (~> 1.6)
5052
useragent (~> 0.16)
51-
actiontext (8.0.4)
52-
actionpack (= 8.0.4)
53-
activerecord (= 8.0.4)
54-
activestorage (= 8.0.4)
55-
activesupport (= 8.0.4)
53+
actiontext (8.1.1)
54+
action_text-trix (~> 2.1.15)
55+
actionpack (= 8.1.1)
56+
activerecord (= 8.1.1)
57+
activestorage (= 8.1.1)
58+
activesupport (= 8.1.1)
5659
globalid (>= 0.6.0)
5760
nokogiri (>= 1.8.5)
58-
actionview (8.0.4)
59-
activesupport (= 8.0.4)
61+
actionview (8.1.1)
62+
activesupport (= 8.1.1)
6063
builder (~> 3.1)
6164
erubi (~> 1.11)
6265
rails-dom-testing (~> 2.2)
6366
rails-html-sanitizer (~> 1.6)
64-
activejob (8.0.4)
65-
activesupport (= 8.0.4)
67+
activejob (8.1.1)
68+
activesupport (= 8.1.1)
6669
globalid (>= 0.3.6)
67-
activemodel (8.0.4)
68-
activesupport (= 8.0.4)
69-
activerecord (8.0.4)
70-
activemodel (= 8.0.4)
71-
activesupport (= 8.0.4)
70+
activemodel (8.1.1)
71+
activesupport (= 8.1.1)
72+
activerecord (8.1.1)
73+
activemodel (= 8.1.1)
74+
activesupport (= 8.1.1)
7275
timeout (>= 0.4.0)
73-
activestorage (8.0.4)
74-
actionpack (= 8.0.4)
75-
activejob (= 8.0.4)
76-
activerecord (= 8.0.4)
77-
activesupport (= 8.0.4)
76+
activestorage (8.1.1)
77+
actionpack (= 8.1.1)
78+
activejob (= 8.1.1)
79+
activerecord (= 8.1.1)
80+
activesupport (= 8.1.1)
7881
marcel (~> 1.0)
79-
activesupport (8.0.4)
82+
activesupport (8.1.1)
8083
base64
81-
benchmark (>= 0.3)
8284
bigdecimal
8385
concurrent-ruby (~> 1.0, >= 1.3.1)
8486
connection_pool (>= 2.2.5)
8587
drb
8688
i18n (>= 1.6, < 2)
89+
json
8790
logger (>= 1.4.2)
8891
minitest (>= 5.1)
8992
securerandom (>= 0.3)
@@ -94,7 +97,6 @@ GEM
9497
ast (2.4.3)
9598
base64 (0.3.0)
9699
bcrypt (3.1.20)
97-
benchmark (0.5.0)
98100
bigdecimal (3.3.1)
99101
bindex (0.8.1)
100102
bootsnap (1.18.6)
@@ -240,30 +242,30 @@ GEM
240242
rack (>= 1.3)
241243
rackup (2.2.1)
242244
rack (>= 3)
243-
rails (8.0.4)
244-
actioncable (= 8.0.4)
245-
actionmailbox (= 8.0.4)
246-
actionmailer (= 8.0.4)
247-
actionpack (= 8.0.4)
248-
actiontext (= 8.0.4)
249-
actionview (= 8.0.4)
250-
activejob (= 8.0.4)
251-
activemodel (= 8.0.4)
252-
activerecord (= 8.0.4)
253-
activestorage (= 8.0.4)
254-
activesupport (= 8.0.4)
245+
rails (8.1.1)
246+
actioncable (= 8.1.1)
247+
actionmailbox (= 8.1.1)
248+
actionmailer (= 8.1.1)
249+
actionpack (= 8.1.1)
250+
actiontext (= 8.1.1)
251+
actionview (= 8.1.1)
252+
activejob (= 8.1.1)
253+
activemodel (= 8.1.1)
254+
activerecord (= 8.1.1)
255+
activestorage (= 8.1.1)
256+
activesupport (= 8.1.1)
255257
bundler (>= 1.15.0)
256-
railties (= 8.0.4)
258+
railties (= 8.1.1)
257259
rails-dom-testing (2.3.0)
258260
activesupport (>= 5.0.0)
259261
minitest
260262
nokogiri (>= 1.6)
261263
rails-html-sanitizer (1.6.2)
262264
loofah (~> 2.21)
263265
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)
264-
railties (8.0.4)
265-
actionpack (= 8.0.4)
266-
activesupport (= 8.0.4)
266+
railties (8.1.1)
267+
actionpack (= 8.1.1)
268+
activesupport (= 8.1.1)
267269
irb (~> 1.13)
268270
rackup (>= 1.0.0)
269271
rake (>= 12.2)
@@ -416,7 +418,7 @@ DEPENDENCIES
416418
jbuilder
417419
propshaft
418420
puma (>= 5.0)
419-
rails (~> 8.0.2)
421+
rails (~> 8.1.1)
420422
rubocop-rails-omakase
421423
selenium-webdriver
422424
solid_cache

‎debug_fasp/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"

‎debug_fasp/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")

‎debug_fasp/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"

‎debug_fasp/config/application.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
module DebugFasp
2222
class Application < Rails::Application
2323
# Initialize configuration defaults for originally generated Rails version.
24-
config.load_defaults 8.0
24+
config.load_defaults 8.1
2525

2626
# Please, add to the `ignore` list any other `lib` subdirectories that do
2727
# not contain `.rb` files, or that should not be reloaded or eager loaded.

‎debug_fasp/config/ci.rb‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
step "Security: Brakeman code analysis", "bin/brakeman --quiet --no-pager --exit-on-warn --exit-on-error"
10+
11+
step "Tests: Rails", "bin/rails test"
12+
step "Tests: System", "bin/rails test:system"
13+
step "Tests: Seeds", "env RAILS_ENV=test bin/rails db:seed:replant"
14+
15+
# Optional: set a green GitHub commit status to unblock PR merge.
16+
# Requires the `gh` CLI and `gh extension install basecamp/gh-signoff`.
17+
# if success?
18+
# step "Signoff: All systems go. Ready for merge and deploy.", "gh signoff"
19+
# else
20+
# failure "Signoff: CI failed. Do not merge or deploy.", "Fix the issues and try again."
21+
# end
22+
end

‎debug_fasp/config/environments/development.rb‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
# Highlight code that enqueued background job in logs.
4444
config.active_job.verbose_enqueue_logs = true
4545

46+
# Highlight code that triggered redirect in logs.
47+
config.action_dispatch.verbose_redirect_logs = true
48+
49+
# Suppress logger output for asset requests.
50+
config.assets.quiet = true
51+
4652
# Raises error for missing translations.
4753
# config.i18n.raise_on_missing_translations = true
4854

‎debug_fasp/config/environments/production.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
config.log_tags = [ :request_id ]
3535
config.logger = ActiveSupport::TaggedLogging.logger(STDOUT)
3636

37-
# Change to "debug" to log everything (including potentially personally-identifiable information!)
37+
# Change to "debug" to log everything (including potentially personally-identifiable information!).
3838
config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
3939

4040
# Prevent health checks from clogging up the logs.
@@ -50,7 +50,6 @@
5050
config.active_job.queue_adapter = :solid_queue
5151
config.solid_queue.connects_to = { database: { writing: :queue } }
5252

53-
5453
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
5554
# the I18n.default_locale when a translation cannot be found).
5655
config.i18n.fallbacks = true

‎debug_fasp/config/initializers/content_security_policy.rb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
# config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
2121
# config.content_security_policy_nonce_directives = %w(script-src style-src)
2222
#
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+
#
2327
# # Report violations without enforcing the policy.
2428
# # config.content_security_policy_report_only = true
2529
# end

0 commit comments

Comments
 (0)