Skip to content

Commit b2619f3

Browse files
authored
Merge pull request #560 from 3scale/depfu/update/group/rails-8.0.2.1
🚨 [security] Update rails 7.1.6 → 8.0.2.1 (major)
2 parents fdbe5e7 + 6117076 commit b2619f3

8 files changed

Lines changed: 83 additions & 111 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ end
99
gem "mutex_m", "~> 0.3.0"
1010
gem "csv", "~> 3.3"
1111

12-
gem 'rails', '~> 7.2.3'
12+
gem 'rails', '~> 8.0.2'
1313
gem 'zeitwerk', '~> 2.6.18' # keep zeitwerk 2.6 until Ruby is 3.2 or higher
1414
gem 'pg', '~> 1.6.2'
1515

Gemfile.lock

Lines changed: 57 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -9,68 +9,65 @@ GEM
99
remote: https://rubygems.org/
1010
specs:
1111
3scale-api (1.4.0)
12-
actioncable (7.2.3)
13-
actionpack (= 7.2.3)
14-
activesupport (= 7.2.3)
12+
actioncable (8.0.2.1)
13+
actionpack (= 8.0.2.1)
14+
activesupport (= 8.0.2.1)
1515
nio4r (~> 2.0)
1616
websocket-driver (>= 0.6.1)
1717
zeitwerk (~> 2.6)
18-
actionmailbox (7.2.3)
19-
actionpack (= 7.2.3)
20-
activejob (= 7.2.3)
21-
activerecord (= 7.2.3)
22-
activestorage (= 7.2.3)
23-
activesupport (= 7.2.3)
18+
actionmailbox (8.0.2.1)
19+
actionpack (= 8.0.2.1)
20+
activejob (= 8.0.2.1)
21+
activerecord (= 8.0.2.1)
22+
activestorage (= 8.0.2.1)
23+
activesupport (= 8.0.2.1)
2424
mail (>= 2.8.0)
25-
actionmailer (7.2.3)
26-
actionpack (= 7.2.3)
27-
actionview (= 7.2.3)
28-
activejob (= 7.2.3)
29-
activesupport (= 7.2.3)
25+
actionmailer (8.0.2.1)
26+
actionpack (= 8.0.2.1)
27+
actionview (= 8.0.2.1)
28+
activejob (= 8.0.2.1)
29+
activesupport (= 8.0.2.1)
3030
mail (>= 2.8.0)
3131
rails-dom-testing (~> 2.2)
32-
actionpack (7.2.3)
33-
actionview (= 7.2.3)
34-
activesupport (= 7.2.3)
35-
cgi
32+
actionpack (8.0.2.1)
33+
actionview (= 8.0.2.1)
34+
activesupport (= 8.0.2.1)
3635
nokogiri (>= 1.8.5)
37-
racc
38-
rack (>= 2.2.4, < 3.3)
36+
rack (>= 2.2.4)
3937
rack-session (>= 1.0.1)
4038
rack-test (>= 0.6.3)
4139
rails-dom-testing (~> 2.2)
4240
rails-html-sanitizer (~> 1.6)
4341
useragent (~> 0.16)
44-
actiontext (7.2.3)
45-
actionpack (= 7.2.3)
46-
activerecord (= 7.2.3)
47-
activestorage (= 7.2.3)
48-
activesupport (= 7.2.3)
42+
actiontext (8.0.2.1)
43+
actionpack (= 8.0.2.1)
44+
activerecord (= 8.0.2.1)
45+
activestorage (= 8.0.2.1)
46+
activesupport (= 8.0.2.1)
4947
globalid (>= 0.6.0)
5048
nokogiri (>= 1.8.5)
51-
actionview (7.2.3)
52-
activesupport (= 7.2.3)
49+
actionview (8.0.2.1)
50+
activesupport (= 8.0.2.1)
5351
builder (~> 3.1)
54-
cgi
5552
erubi (~> 1.11)
5653
rails-dom-testing (~> 2.2)
5754
rails-html-sanitizer (~> 1.6)
58-
activejob (7.2.3)
59-
activesupport (= 7.2.3)
55+
activejob (8.0.2.1)
56+
activesupport (= 8.0.2.1)
6057
globalid (>= 0.3.6)
61-
activemodel (7.2.3)
62-
activesupport (= 7.2.3)
63-
activerecord (7.2.3)
64-
activemodel (= 7.2.3)
65-
activesupport (= 7.2.3)
58+
activemodel (8.0.2.1)
59+
activesupport (= 8.0.2.1)
60+
activerecord (8.0.2.1)
61+
activemodel (= 8.0.2.1)
62+
activesupport (= 8.0.2.1)
6663
timeout (>= 0.4.0)
67-
activestorage (7.2.3)
68-
actionpack (= 7.2.3)
69-
activejob (= 7.2.3)
70-
activerecord (= 7.2.3)
71-
activesupport (= 7.2.3)
64+
activestorage (8.0.2.1)
65+
actionpack (= 8.0.2.1)
66+
activejob (= 8.0.2.1)
67+
activerecord (= 8.0.2.1)
68+
activesupport (= 8.0.2.1)
7269
marcel (~> 1.0)
73-
activesupport (7.2.3)
70+
activesupport (8.0.2.1)
7471
base64
7572
benchmark (>= 0.3)
7673
bigdecimal
@@ -82,6 +79,7 @@ GEM
8279
minitest (>= 5.1)
8380
securerandom (>= 0.3)
8481
tzinfo (~> 2.0, >= 2.0.5)
82+
uri (>= 0.13.1)
8583
addressable (2.8.0)
8684
public_suffix (>= 2.0.2, < 5.0)
8785
ansi (1.5.0)
@@ -97,7 +95,6 @@ GEM
9795
concurrent-ruby (~> 1.0)
9896
builder (3.3.0)
9997
byebug (12.0.0)
100-
cgi (0.5.1)
10198
codecov (0.4.3)
10299
simplecov (>= 0.15, < 0.22)
103100
coderay (1.1.3)
@@ -281,31 +278,30 @@ GEM
281278
rackup (1.0.1)
282279
rack (< 3)
283280
webrick
284-
rails (7.2.3)
285-
actioncable (= 7.2.3)
286-
actionmailbox (= 7.2.3)
287-
actionmailer (= 7.2.3)
288-
actionpack (= 7.2.3)
289-
actiontext (= 7.2.3)
290-
actionview (= 7.2.3)
291-
activejob (= 7.2.3)
292-
activemodel (= 7.2.3)
293-
activerecord (= 7.2.3)
294-
activestorage (= 7.2.3)
295-
activesupport (= 7.2.3)
281+
rails (8.0.2.1)
282+
actioncable (= 8.0.2.1)
283+
actionmailbox (= 8.0.2.1)
284+
actionmailer (= 8.0.2.1)
285+
actionpack (= 8.0.2.1)
286+
actiontext (= 8.0.2.1)
287+
actionview (= 8.0.2.1)
288+
activejob (= 8.0.2.1)
289+
activemodel (= 8.0.2.1)
290+
activerecord (= 8.0.2.1)
291+
activestorage (= 8.0.2.1)
292+
activesupport (= 8.0.2.1)
296293
bundler (>= 1.15.0)
297-
railties (= 7.2.3)
294+
railties (= 8.0.2.1)
298295
rails-dom-testing (2.3.0)
299296
activesupport (>= 5.0.0)
300297
minitest
301298
nokogiri (>= 1.6)
302299
rails-html-sanitizer (1.6.2)
303300
loofah (~> 2.21)
304301
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)
305-
railties (7.2.3)
306-
actionpack (= 7.2.3)
307-
activesupport (= 7.2.3)
308-
cgi
302+
railties (8.0.2.1)
303+
actionpack (= 8.0.2.1)
304+
activesupport (= 8.0.2.1)
309305
irb (~> 1.13)
310306
rackup (>= 1.0.0)
311307
rake (>= 12.2)
@@ -379,6 +375,7 @@ GEM
379375
unicode-display_width (3.2.0)
380376
unicode-emoji (~> 4.1)
381377
unicode-emoji (4.1.0)
378+
uri (1.1.1)
382379
useragent (0.16.11)
383380
validate_url (1.0.15)
384381
activemodel (>= 3.0.0)
@@ -440,7 +437,7 @@ DEPENDENCIES
440437
puma (~> 5.2)
441438
que (~> 2.4.1)
442439
que-web
443-
rails (~> 7.2.3)
440+
rails (~> 8.0.2)
444441
responders (~> 3.0.1)
445442
rubocop
446443
rubocop-performance

config/application.rb

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
module Zync
2222
class Application < Rails::Application
2323
# Initialize configuration defaults for originally generated Rails version.
24-
config.load_defaults 7.2
24+
config.load_defaults 8.0
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.
@@ -41,13 +41,6 @@ class Application < Rails::Application
4141

4242
config.active_job.queue_adapter = :que
4343

44-
# This rails setting changed several time for the last Rails version
45-
# https://github.com/rails/rails/blob/6f39910d26eb590cb214a0fce5858fe0d7ddfff8/activejob/CHANGELOG.md?plain=1#L48-L58
46-
#
47-
# For Rails 7.2, set it to `:always`: https://github.com/que-rb/que/issues/430
48-
# For Rails 8.0+, Remove it
49-
config.active_job.enqueue_after_transaction_commit = :always
50-
5144
begin
5245
que = config_for(:que)&.deep_symbolize_keys
5346

config/environments/development.rb

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
ActionDispatch::DebugLocks
88
# Settings specified here will take precedence over those in config/application.rb.
99

10-
# In the development environment your application's code is reloaded any time
11-
# it changes. This slows down response time but is perfect for development
12-
# since you don't have to restart the web server when you make code changes.
10+
# Make code changes take effect immediately without server restart.
1311
config.enable_reloading = true
1412

1513
# Do not eager load code on boot.
@@ -21,8 +19,8 @@
2119
# Enable server timing.
2220
config.server_timing = true
2321

24-
# Enable/disable caching. By default caching is disabled.
25-
# Run rails dev:cache to toggle caching.
22+
# Enable/disable Action Controller caching. By default Action Controller caching is disabled.
23+
# Run rails dev:cache to toggle Action Controller caching.
2624
if Rails.root.join("tmp/caching-dev.txt").exist?
2725
config.cache_store = :memory_store
2826
config.public_file_server.headers = {
@@ -49,6 +47,9 @@
4947
# Highlight code that triggered database queries in logs.
5048
config.active_record.verbose_query_logs = true
5149

50+
# Append comments with runtime information tags to SQL queries in logs.
51+
config.active_record.query_log_tags_enabled = true
52+
5253
# Highlight code that enqueued background job in logs.
5354
config.active_job.verbose_enqueue_logs = true
5455

config/environments/production.rb

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,14 @@
66
# Code is not reloaded between requests.
77
config.enable_reloading = false
88

9-
# Eager load code on boot. This eager loads most of Rails and
10-
# your application in memory, allowing both threaded web servers
11-
# and those relying on copy on write to perform better.
12-
# Rake tasks automatically ignore this option for performance.
9+
# Eager load code on boot for better performance and memory savings (ignored by Rake tasks).
1310
config.eager_load = true
1411

15-
# Full error reports are disabled and caching is turned on.
12+
# Full error reports are disabled.
1613
config.consider_all_requests_local = false
1714

18-
# Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment
19-
# key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files).
20-
# config.require_master_key = true
15+
# Cache assets for far-future expiry since they are all digest stamped.
16+
# config.public_file_server.headers = { "cache-control" => "public, max-age=#{1.year.to_i}" }
2117

2218
# Disable serving static files from `public/`, relying on NGINX/Apache to do so instead.
2319
config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
@@ -44,12 +40,10 @@
4440
# .tap { |logger| logger.formatter = ::Logger::Formatter.new }
4541
# .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
4642

47-
# Prepend all log lines with the following tags.
43+
# Log to STDOUT with the current request id as a default log tag.
4844
config.log_tags = [ ]
4945

50-
# "info" includes generic and useful information about system operation, but avoids logging too much
51-
# information to avoid inadvertent exposure of personally identifiable information (PII). If you
52-
# want to log everything, set the level to "debug".
46+
# Change to "debug" to log everything (including potentially personally-identifiable information!)
5347
config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
5448

5549
# Use default logging formatter so that PID and timestamp are not suppressed.
@@ -65,20 +59,23 @@
6559
config.logger = ActiveSupport::TaggedLogging.new(logger)
6660
end
6761

68-
# Use a different cache store in production.
62+
# Prevent health checks from clogging up the logs.
63+
# config.silence_healthcheck_path = "/up"
64+
65+
# Don't log any deprecations.
66+
config.active_support.report_deprecations = false
67+
68+
# Replace the default in-process memory cache store with a durable alternative.
6969
# config.cache_store = :mem_cache_store
7070

71-
# Use a real queuing backend for Active Job (and separate queues per environment).
71+
# Replace the default in-process and non-durable queuing backend for Active Job.
7272
# config.active_job.queue_adapter = :resque
7373
# config.active_job.queue_name_prefix = "zync_production"
7474

7575
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
7676
# the I18n.default_locale when a translation cannot be found).
7777
config.i18n.fallbacks = true
7878

79-
# Don't log any deprecations.
80-
config.active_support.report_deprecations = false
81-
8279
# Do not dump schema after migrations.
8380
config.active_record.dump_schema_after_migration = false
8481

config/environments/test.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
require "active_support/core_ext/integer/time"
2-
31
# The test environment is used exclusively to run your application's
42
# test suite. You never need to work with it otherwise. Remember that
53
# your test database is "scratch space" for the test suite and is wiped

config/initializers/filter_parameter_logging.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
# Use this to limit dissemination of sensitive information.
55
# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
66
Rails.application.config.filter_parameters += [
7-
:password, :access_token, :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
7+
:password, :access_token, :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc
88
]

config/puma.rb

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
# The ideal number of threads per worker depends both on how much time the
99
# application spends waiting for IO operations and on how much you wish to
10-
# to prioritize throughput over latency.
10+
# prioritize throughput over latency.
1111
#
1212
# As a rule of thumb, increasing the number of threads will increase how much
1313
# traffic a given process can handle (throughput), but due to CRuby's
@@ -30,30 +30,16 @@
3030
worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
3131

3232
# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
33-
#
3433
port ENV.fetch("PORT") { 3000 }
3534

3635
# Specifies the `environment` that Puma will run in.
3736
#
3837
environment ENV.fetch("RAILS_ENV") { "development" }
3938

40-
# Specifies the `pidfile` that Puma will use.
39+
# Specify the PID file. Defaults to tmp/pids/server.pid in development.
40+
# In other environments, only set the PID file if requested.
4141
pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
4242

43-
# Specifies the number of `workers` to boot in clustered mode.
44-
# Workers are forked web server processes. If using threads and workers together
45-
# the concurrency of the application would be max `threads` * `workers`.
46-
# Workers do not work on JRuby or Windows (both of which do not support
47-
# processes).
48-
#
49-
# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
50-
51-
# Use the `preload_app!` method when specifying a `workers` number.
52-
# This directive tells Puma to first boot the application and load code
53-
# before forking the application. This takes advantage of Copy On Write
54-
# process behavior so workers use less memory.
55-
#
56-
# preload_app!
5743

5844
queue_requests false # let the higher layer figure that out
5945

0 commit comments

Comments
 (0)