Skip to content

Commit f5369a8

Browse files
authored
Merge pull request #295 from rails/dependabot/bundler/rails-7.2.1
Bump rails from 7.0.8.4 to 7.2.1
2 parents fb2fd95 + 7f2531d commit f5369a8

File tree

15 files changed

+353
-127
lines changed

15 files changed

+353
-127
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ruby '3.3.4'
33
source 'https://rubygems.org'
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

6-
gem 'rails', '~> 7.1.0'
6+
gem 'rails', '~> 7.2.1'
77

88
gem 'sprockets-rails'
99

Gemfile.lock

Lines changed: 66 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,78 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.1.4)
5-
actionpack (= 7.1.4)
6-
activesupport (= 7.1.4)
4+
actioncable (7.2.1)
5+
actionpack (= 7.2.1)
6+
activesupport (= 7.2.1)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
99
zeitwerk (~> 2.6)
10-
actionmailbox (7.1.4)
11-
actionpack (= 7.1.4)
12-
activejob (= 7.1.4)
13-
activerecord (= 7.1.4)
14-
activestorage (= 7.1.4)
15-
activesupport (= 7.1.4)
16-
mail (>= 2.7.1)
17-
net-imap
18-
net-pop
19-
net-smtp
20-
actionmailer (7.1.4)
21-
actionpack (= 7.1.4)
22-
actionview (= 7.1.4)
23-
activejob (= 7.1.4)
24-
activesupport (= 7.1.4)
25-
mail (~> 2.5, >= 2.5.4)
26-
net-imap
27-
net-pop
28-
net-smtp
10+
actionmailbox (7.2.1)
11+
actionpack (= 7.2.1)
12+
activejob (= 7.2.1)
13+
activerecord (= 7.2.1)
14+
activestorage (= 7.2.1)
15+
activesupport (= 7.2.1)
16+
mail (>= 2.8.0)
17+
actionmailer (7.2.1)
18+
actionpack (= 7.2.1)
19+
actionview (= 7.2.1)
20+
activejob (= 7.2.1)
21+
activesupport (= 7.2.1)
22+
mail (>= 2.8.0)
2923
rails-dom-testing (~> 2.2)
30-
actionpack (7.1.4)
31-
actionview (= 7.1.4)
32-
activesupport (= 7.1.4)
24+
actionpack (7.2.1)
25+
actionview (= 7.2.1)
26+
activesupport (= 7.2.1)
3327
nokogiri (>= 1.8.5)
3428
racc
35-
rack (>= 2.2.4)
29+
rack (>= 2.2.4, < 3.2)
3630
rack-session (>= 1.0.1)
3731
rack-test (>= 0.6.3)
3832
rails-dom-testing (~> 2.2)
3933
rails-html-sanitizer (~> 1.6)
34+
useragent (~> 0.16)
4035
actionpack-page_caching (1.2.4)
4136
actionpack (>= 4.0.0)
42-
actiontext (7.1.4)
43-
actionpack (= 7.1.4)
44-
activerecord (= 7.1.4)
45-
activestorage (= 7.1.4)
46-
activesupport (= 7.1.4)
37+
actiontext (7.2.1)
38+
actionpack (= 7.2.1)
39+
activerecord (= 7.2.1)
40+
activestorage (= 7.2.1)
41+
activesupport (= 7.2.1)
4742
globalid (>= 0.6.0)
4843
nokogiri (>= 1.8.5)
49-
actionview (7.1.4)
50-
activesupport (= 7.1.4)
44+
actionview (7.2.1)
45+
activesupport (= 7.2.1)
5146
builder (~> 3.1)
5247
erubi (~> 1.11)
5348
rails-dom-testing (~> 2.2)
5449
rails-html-sanitizer (~> 1.6)
55-
activejob (7.1.4)
56-
activesupport (= 7.1.4)
50+
activejob (7.2.1)
51+
activesupport (= 7.2.1)
5752
globalid (>= 0.3.6)
58-
activemodel (7.1.4)
59-
activesupport (= 7.1.4)
60-
activerecord (7.1.4)
61-
activemodel (= 7.1.4)
62-
activesupport (= 7.1.4)
53+
activemodel (7.2.1)
54+
activesupport (= 7.2.1)
55+
activerecord (7.2.1)
56+
activemodel (= 7.2.1)
57+
activesupport (= 7.2.1)
6358
timeout (>= 0.4.0)
64-
activestorage (7.1.4)
65-
actionpack (= 7.1.4)
66-
activejob (= 7.1.4)
67-
activerecord (= 7.1.4)
68-
activesupport (= 7.1.4)
59+
activestorage (7.2.1)
60+
actionpack (= 7.2.1)
61+
activejob (= 7.2.1)
62+
activerecord (= 7.2.1)
63+
activesupport (= 7.2.1)
6964
marcel (~> 1.0)
70-
activesupport (7.1.4)
65+
activesupport (7.2.1)
7166
base64
7267
bigdecimal
73-
concurrent-ruby (~> 1.0, >= 1.0.2)
68+
concurrent-ruby (~> 1.0, >= 1.3.1)
7469
connection_pool (>= 2.2.5)
7570
drb
7671
i18n (>= 1.6, < 2)
72+
logger (>= 1.4.2)
7773
minitest (>= 5.1)
78-
mutex_m
79-
tzinfo (~> 2.0)
74+
securerandom (>= 0.3)
75+
tzinfo (~> 2.0, >= 2.0.5)
8076
airbrussh (1.5.2)
8177
sshkit (>= 1.6.1, != 1.7.0)
8278
base64 (0.2.0)
@@ -125,6 +121,7 @@ GEM
125121
irb (1.14.0)
126122
rdoc (>= 4.0.0)
127123
reline (>= 0.4.2)
124+
logger (1.6.0)
128125
loofah (2.22.0)
129126
crass (~> 1.0.2)
130127
nokogiri (>= 1.12.0)
@@ -137,7 +134,6 @@ GEM
137134
mini_mime (1.1.5)
138135
mini_portile2 (2.8.7)
139136
minitest (5.25.1)
140-
mutex_m (0.2.0)
141137
net-imap (0.4.14)
142138
date
143139
net-protocol
@@ -170,20 +166,20 @@ GEM
170166
rackup (1.0.0)
171167
rack (< 3)
172168
webrick
173-
rails (7.1.4)
174-
actioncable (= 7.1.4)
175-
actionmailbox (= 7.1.4)
176-
actionmailer (= 7.1.4)
177-
actionpack (= 7.1.4)
178-
actiontext (= 7.1.4)
179-
actionview (= 7.1.4)
180-
activejob (= 7.1.4)
181-
activemodel (= 7.1.4)
182-
activerecord (= 7.1.4)
183-
activestorage (= 7.1.4)
184-
activesupport (= 7.1.4)
169+
rails (7.2.1)
170+
actioncable (= 7.2.1)
171+
actionmailbox (= 7.2.1)
172+
actionmailer (= 7.2.1)
173+
actionpack (= 7.2.1)
174+
actiontext (= 7.2.1)
175+
actionview (= 7.2.1)
176+
activejob (= 7.2.1)
177+
activemodel (= 7.2.1)
178+
activerecord (= 7.2.1)
179+
activestorage (= 7.2.1)
180+
activesupport (= 7.2.1)
185181
bundler (>= 1.15.0)
186-
railties (= 7.1.4)
182+
railties (= 7.2.1)
187183
rails-controller-testing (1.0.5)
188184
actionpack (>= 5.0.1.rc1)
189185
actionview (>= 5.0.1.rc1)
@@ -195,10 +191,10 @@ GEM
195191
rails-html-sanitizer (1.6.0)
196192
loofah (~> 2.21)
197193
nokogiri (~> 1.14)
198-
railties (7.1.4)
199-
actionpack (= 7.1.4)
200-
activesupport (= 7.1.4)
201-
irb
194+
railties (7.2.1)
195+
actionpack (= 7.2.1)
196+
activesupport (= 7.2.1)
197+
irb (~> 1.13)
202198
rackup (>= 1.0.0)
203199
rake (>= 12.2)
204200
thor (~> 1.0, >= 1.2.2)
@@ -223,6 +219,7 @@ GEM
223219
sprockets (> 3.0)
224220
sprockets-rails
225221
tilt
222+
securerandom (0.3.1)
226223
sprockets (4.2.1)
227224
concurrent-ruby (~> 1.0)
228225
rack (>= 2.2.4, < 4)
@@ -247,6 +244,7 @@ GEM
247244
uglifier (4.2.0)
248245
execjs (>= 0.3.0, < 3)
249246
unf (0.2.0)
247+
useragent (0.16.10)
250248
web-console (4.2.1)
251249
actionview (>= 6.0.0)
252250
activemodel (>= 6.0.0)
@@ -273,7 +271,7 @@ DEPENDENCIES
273271
pg
274272
puma (~> 5.6)
275273
rack (< 3.0)
276-
rails (~> 7.1.0)
274+
rails (~> 7.2.1)
277275
rails-controller-testing
278276
rbnacl (>= 3.2, < 8.0)
279277
rbnacl-libsodium

bin/setup

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env ruby
22
require "fileutils"
33

4-
# path to your application root.
54
APP_ROOT = File.expand_path("..", __dir__)
5+
APP_NAME = "rails-contributors"
66

77
def system!(*args)
88
system(*args, exception: true)
@@ -30,4 +30,8 @@ FileUtils.chdir APP_ROOT do
3030

3131
puts "\n== Restarting application server =="
3232
system! "bin/rails restart"
33+
34+
# puts "\n== Configuring puma-dev =="
35+
# system "ln -nfs #{APP_ROOT} ~/.puma-dev/#{APP_NAME}"
36+
# system "curl -Is https://#{APP_NAME}.test/up | head -n 1"
3337
end

config/application.rb

Lines changed: 2 additions & 2 deletions
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+
1617
# Require the gems listed in Gemfile, including any gems
1718
# you've limited to :test, :development, or :production.
1819
Bundler.require(*Rails.groups)
@@ -24,13 +25,12 @@ class Application < Rails::Application
2425
# Initialize configuration defaults for originally generated Rails version.
2526
config.load_defaults 7.1
2627

27-
config.add_autoload_paths_to_load_path = false
2828
config.middleware.insert 0, BotKiller
2929

3030
# Please, add to the `ignore` list any other `lib` subdirectories that do
3131
# not contain `.rb` files, or that should not be reloaded or eager loaded.
3232
# Common ones are `templates`, `generators`, or `middleware`, for example.
33-
# config.autoload_lib(ignore: %w(assets tasks))
33+
# config.autoload_lib(ignore: %w[assets tasks])
3434

3535
# Configuration for the application, engines, and railties goes here.
3636
#

config/environments/development.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# Show full error reports.
1515
config.consider_all_requests_local = true
1616

17-
# Enable server timing
17+
# Enable server timing.
1818
config.server_timing = true
1919

2020
# Enable/disable caching. By default caching is disabled.
@@ -24,9 +24,7 @@
2424
config.action_controller.enable_fragment_cache_logging = true
2525

2626
config.cache_store = :memory_store
27-
config.public_file_server.headers = {
28-
"Cache-Control" => "public, max-age=#{2.days.to_i}"
29-
}
27+
config.public_file_server.headers = { "Cache-Control" => "public, max-age=#{2.days.to_i}" }
3028
else
3129
config.action_controller.perform_caching = false
3230

@@ -60,8 +58,8 @@
6058
# config.i18n.raise_on_missing_translations = true
6159

6260
# Annotate rendered view with file names.
63-
# config.action_view.annotate_rendered_view_with_filenames = true
61+
config.action_view.annotate_rendered_view_with_filenames = true
6462

65-
# Raise error when a before_action's only/except options reference missing actions
63+
# Raise error when a before_action's only/except options reference missing actions.
6664
config.action_controller.raise_on_missing_callback_actions = true
6765
end

config/environments/production.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
4545
# config.force_ssl = true
4646

47+
# Skip http-to-https redirect for the default health check endpoint.
48+
# config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
49+
4750
# Log to STDOUT by default
4851
# config.logger = ActiveSupport::Logger.new(STDOUT)
4952
# .tap { |logger| logger.formatter = ::Logger::Formatter.new }

config/environments/test.rb

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
config.eager_load = ENV["CI"].present?
1919

2020
# Configure public file server for tests with Cache-Control for performance.
21-
config.public_file_server.enabled = true
22-
config.public_file_server.headers = {
23-
"Cache-Control" => "public, max-age=#{1.hour.to_i}"
24-
}
21+
config.public_file_server.headers = { "Cache-Control" => "public, max-age=#{1.hour.to_i}" }
2522

2623
# Show full error reports and disable caching.
2724
config.consider_all_requests_local = true
@@ -49,6 +46,6 @@
4946
# Annotate rendered view with file names.
5047
# config.action_view.annotate_rendered_view_with_filenames = true
5148

52-
# Raise error when a before_action's only/except options reference missing actions
49+
# Raise error when a before_action's only/except options reference missing actions.
5350
config.action_controller.raise_on_missing_callback_actions = true
5451
end

config/initializers/assets.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
# Precompile additional assets.
1010
# application.js, application.css, and all non-JS/CSS in the app/assets
1111
# folder are already added.
12-
# Rails.application.config.assets.precompile += %w( admin.js admin.css )
12+
# Rails.application.config.assets.precompile += %w[ admin.js admin.css ]

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-
:passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
7+
:passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
88
]
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Be sure to restart your server when you modify this file.
2+
#
3+
# This file eases your Rails 7.2 framework defaults upgrade.
4+
#
5+
# Uncomment each configuration one by one to switch to the new default.
6+
# Once your application is ready to run with all new defaults, you can remove
7+
# this file and set the `config.load_defaults` to `7.2`.
8+
#
9+
# Read the Guide for Upgrading Ruby on Rails for more info on each option.
10+
# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
11+
12+
###
13+
# Enable validation of migration timestamps. When set, an ActiveRecord::InvalidMigrationTimestampError
14+
# will be raised if the timestamp prefix for a migration is more than a day ahead of the timestamp
15+
# associated with the current time. This is done to prevent forward-dating of migration files, which can
16+
# impact migration generation and other migration commands.
17+
#
18+
# Applications with existing timestamped migrations that do not adhere to the
19+
# expected format can disable validation by setting this config to `false`.
20+
#++
21+
Rails.application.config.active_record.validate_migration_timestamps = true
22+
23+
###
24+
# Controls whether the PostgresqlAdapter should decode dates automatically with manual queries.
25+
#
26+
# Example:
27+
# ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.select_value("select '2024-01-01'::date") #=> Date
28+
#
29+
# This query used to return a `String`.
30+
#++
31+
Rails.application.config.active_record.postgresql_adapter_decode_dates = true
32+
33+
###
34+
# Enables YJIT as of Ruby 3.3, to bring sizeable performance improvements. If you are
35+
# deploying to a memory constrained environment you may want to set this to `false`.
36+
#++
37+
# Rails.application.config.yjit = true

0 commit comments

Comments
 (0)