Skip to content

Commit a918895

Browse files
committed
Bump rails from 7.1.3.4 to 7.2.0
1 parent ea95a58 commit a918895

13 files changed

+209
-117
lines changed

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ source "https://rubygems.org"
22

33
ruby "3.3.4"
44

5-
gem "rails", "~> 7.1.2"
6-
gem "sqlite3", "~> 1.7" # FIXME: relax when rails/rails#51636 will be released
5+
gem "rails", "~> 7.2.0"
6+
gem "sqlite3"
77
gem "puma"
88

99
gem "sprockets-rails"

Gemfile.lock

+69-72
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,46 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.1.3.4)
5-
actionpack (= 7.1.3.4)
6-
activesupport (= 7.1.3.4)
4+
actioncable (7.2.0)
5+
actionpack (= 7.2.0)
6+
activesupport (= 7.2.0)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
99
zeitwerk (~> 2.6)
10-
actionmailbox (7.1.3.4)
11-
actionpack (= 7.1.3.4)
12-
activejob (= 7.1.3.4)
13-
activerecord (= 7.1.3.4)
14-
activestorage (= 7.1.3.4)
15-
activesupport (= 7.1.3.4)
16-
mail (>= 2.7.1)
17-
net-imap
18-
net-pop
19-
net-smtp
20-
actionmailer (7.1.3.4)
21-
actionpack (= 7.1.3.4)
22-
actionview (= 7.1.3.4)
23-
activejob (= 7.1.3.4)
24-
activesupport (= 7.1.3.4)
25-
mail (~> 2.5, >= 2.5.4)
26-
net-imap
27-
net-pop
28-
net-smtp
10+
actionmailbox (7.2.0)
11+
actionpack (= 7.2.0)
12+
activejob (= 7.2.0)
13+
activerecord (= 7.2.0)
14+
activestorage (= 7.2.0)
15+
activesupport (= 7.2.0)
16+
mail (>= 2.8.0)
17+
actionmailer (7.2.0)
18+
actionpack (= 7.2.0)
19+
actionview (= 7.2.0)
20+
activejob (= 7.2.0)
21+
activesupport (= 7.2.0)
22+
mail (>= 2.8.0)
2923
rails-dom-testing (~> 2.2)
30-
actionpack (7.1.3.4)
31-
actionview (= 7.1.3.4)
32-
activesupport (= 7.1.3.4)
24+
actionpack (7.2.0)
25+
actionview (= 7.2.0)
26+
activesupport (= 7.2.0)
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)
40-
actiontext (7.1.3.4)
41-
actionpack (= 7.1.3.4)
42-
activerecord (= 7.1.3.4)
43-
activestorage (= 7.1.3.4)
44-
activesupport (= 7.1.3.4)
34+
useragent (~> 0.16)
35+
actiontext (7.2.0)
36+
actionpack (= 7.2.0)
37+
activerecord (= 7.2.0)
38+
activestorage (= 7.2.0)
39+
activesupport (= 7.2.0)
4540
globalid (>= 0.6.0)
4641
nokogiri (>= 1.8.5)
47-
actionview (7.1.3.4)
48-
activesupport (= 7.1.3.4)
42+
actionview (7.2.0)
43+
activesupport (= 7.2.0)
4944
builder (~> 3.1)
5045
erubi (~> 1.11)
5146
rails-dom-testing (~> 2.2)
@@ -59,31 +54,32 @@ GEM
5954
kaminari (>= 1.2.1)
6055
railties (>= 6.1)
6156
ransack (>= 4.0)
62-
activejob (7.1.3.4)
63-
activesupport (= 7.1.3.4)
57+
activejob (7.2.0)
58+
activesupport (= 7.2.0)
6459
globalid (>= 0.3.6)
65-
activemodel (7.1.3.4)
66-
activesupport (= 7.1.3.4)
67-
activerecord (7.1.3.4)
68-
activemodel (= 7.1.3.4)
69-
activesupport (= 7.1.3.4)
60+
activemodel (7.2.0)
61+
activesupport (= 7.2.0)
62+
activerecord (7.2.0)
63+
activemodel (= 7.2.0)
64+
activesupport (= 7.2.0)
7065
timeout (>= 0.4.0)
71-
activestorage (7.1.3.4)
72-
actionpack (= 7.1.3.4)
73-
activejob (= 7.1.3.4)
74-
activerecord (= 7.1.3.4)
75-
activesupport (= 7.1.3.4)
66+
activestorage (7.2.0)
67+
actionpack (= 7.2.0)
68+
activejob (= 7.2.0)
69+
activerecord (= 7.2.0)
70+
activesupport (= 7.2.0)
7671
marcel (~> 1.0)
77-
activesupport (7.1.3.4)
72+
activesupport (7.2.0)
7873
base64
7974
bigdecimal
80-
concurrent-ruby (~> 1.0, >= 1.0.2)
75+
concurrent-ruby (~> 1.0, >= 1.3.1)
8176
connection_pool (>= 2.2.5)
8277
drb
8378
i18n (>= 1.6, < 2)
79+
logger (>= 1.4.2)
8480
minitest (>= 5.1)
85-
mutex_m
86-
tzinfo (~> 2.0)
81+
securerandom (>= 0.3)
82+
tzinfo (~> 2.0, >= 2.0.5)
8783
addressable (2.8.7)
8884
public_suffix (>= 2.0.2, < 7.0)
8985
arbre (2.0.0)
@@ -170,7 +166,6 @@ GEM
170166
mini_mime (1.1.5)
171167
mini_portile2 (2.8.7)
172168
minitest (5.25.0)
173-
mutex_m (0.2.0)
174169
net-imap (0.4.14)
175170
date
176171
net-protocol
@@ -203,31 +198,31 @@ GEM
203198
rackup (2.1.0)
204199
rack (>= 3)
205200
webrick (~> 1.8)
206-
rails (7.1.3.4)
207-
actioncable (= 7.1.3.4)
208-
actionmailbox (= 7.1.3.4)
209-
actionmailer (= 7.1.3.4)
210-
actionpack (= 7.1.3.4)
211-
actiontext (= 7.1.3.4)
212-
actionview (= 7.1.3.4)
213-
activejob (= 7.1.3.4)
214-
activemodel (= 7.1.3.4)
215-
activerecord (= 7.1.3.4)
216-
activestorage (= 7.1.3.4)
217-
activesupport (= 7.1.3.4)
201+
rails (7.2.0)
202+
actioncable (= 7.2.0)
203+
actionmailbox (= 7.2.0)
204+
actionmailer (= 7.2.0)
205+
actionpack (= 7.2.0)
206+
actiontext (= 7.2.0)
207+
actionview (= 7.2.0)
208+
activejob (= 7.2.0)
209+
activemodel (= 7.2.0)
210+
activerecord (= 7.2.0)
211+
activestorage (= 7.2.0)
212+
activesupport (= 7.2.0)
218213
bundler (>= 1.15.0)
219-
railties (= 7.1.3.4)
214+
railties (= 7.2.0)
220215
rails-dom-testing (2.2.0)
221216
activesupport (>= 5.0.0)
222217
minitest
223218
nokogiri (>= 1.6)
224219
rails-html-sanitizer (1.6.0)
225220
loofah (~> 2.21)
226221
nokogiri (~> 1.14)
227-
railties (7.1.3.4)
228-
actionpack (= 7.1.3.4)
229-
activesupport (= 7.1.3.4)
230-
irb
222+
railties (7.2.0)
223+
actionpack (= 7.2.0)
224+
activesupport (= 7.2.0)
225+
irb (~> 1.13)
231226
rackup (>= 1.0.0)
232227
rake (>= 12.2)
233228
thor (~> 1.0, >= 1.2.2)
@@ -249,6 +244,7 @@ GEM
249244
strscan
250245
ruby2_keywords (0.0.5)
251246
rubyzip (2.3.2)
247+
securerandom (0.3.1)
252248
selenium-webdriver (4.23.0)
253249
base64 (~> 0.2)
254250
logger (~> 1.4)
@@ -271,16 +267,17 @@ GEM
271267
actionpack (>= 6.1)
272268
activesupport (>= 6.1)
273269
sprockets (>= 3.0.0)
274-
sqlite3 (1.7.3)
270+
sqlite3 (2.0.4)
275271
mini_portile2 (~> 2.8.0)
276-
sqlite3 (1.7.3-arm64-darwin)
277-
sqlite3 (1.7.3-x86_64-linux)
272+
sqlite3 (2.0.4-arm64-darwin)
273+
sqlite3 (2.0.4-x86_64-linux-gnu)
278274
stringio (3.1.1)
279275
strscan (3.1.0)
280276
thor (1.3.1)
281277
timeout (0.4.1)
282278
tzinfo (2.0.6)
283279
concurrent-ruby (~> 1.0)
280+
useragent (0.16.10)
284281
warden (1.2.9)
285282
rack (>= 2.0.9)
286283
webrick (1.8.1)
@@ -306,12 +303,12 @@ DEPENDENCIES
306303
devise
307304
importmap-rails
308305
puma
309-
rails (~> 7.1.2)
306+
rails (~> 7.2.0)
310307
selenium-webdriver
311308
simplecov
312309
simplecov-cobertura
313310
sprockets-rails
314-
sqlite3 (~> 1.7)
311+
sqlite3
315312
tzinfo-data
316313

317314
RUBY VERSION

bin/brakeman

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env ruby
2+
require "rubygems"
3+
require "bundler/setup"
4+
5+
ARGV.unshift("--ensure-latest")
6+
7+
load Gem.bin_path("brakeman", "brakeman")

bin/rubocop

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env ruby
2+
require "rubygems"
3+
require "bundler/setup"
4+
5+
# explicit rubocop config increases performance slightly while avoiding config confusion.
6+
ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
7+
8+
load Gem.bin_path("rubocop", "rubocop")

bin/setup

+5-1
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 = "active-admin-demo"
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
module ActiveAdminDemo
2222
class Application < Rails::Application
2323
# Initialize configuration defaults for originally generated Rails version.
24-
config.load_defaults 7.1
24+
config.load_defaults 7.2
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.
2828
# Common ones are `templates`, `generators`, or `middleware`, for example.
29-
config.autoload_lib(ignore: %w(assets tasks))
29+
config.autoload_lib(ignore: %w[assets tasks])
3030

3131
# Configuration for the application, engines, and railties goes here.
3232
#

config/environments/development.rb

+11-6
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

@@ -36,8 +34,12 @@
3634
# Don't care if the mailer can't send.
3735
config.action_mailer.raise_delivery_errors = false
3836

37+
# Disable caching for Action Mailer templates even if Action Controller
38+
# caching is enabled.
3939
config.action_mailer.perform_caching = false
4040

41+
config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
42+
4143
# Print deprecation notices to the Rails logger.
4244
config.active_support.deprecation = :log
4345

@@ -63,8 +65,11 @@
6365
# config.i18n.raise_on_missing_translations = true
6466

6567
# Annotate rendered view with file names.
66-
# config.action_view.annotate_rendered_view_with_filenames = true
68+
config.action_view.annotate_rendered_view_with_filenames = true
6769

68-
# Raise error when a before_action's only/except options reference missing actions
70+
# Raise error when a before_action's only/except options reference missing actions.
6971
config.action_controller.raise_on_missing_callback_actions = true
72+
73+
# Apply autocorrection by RuboCop to files generated by `bin/rails generate`.
74+
# config.generators.apply_rubocop_autocorrect_after_generate!
7075
end

config/environments/production.rb

+5
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
4444
config.force_ssl = true
4545

46+
# Skip http-to-https redirect for the default health check endpoint.
47+
# config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
48+
4649
# Log to STDOUT by default
4750
config.logger = ActiveSupport::Logger.new(STDOUT)
4851
.tap { |logger| logger.formatter = ::Logger::Formatter.new }
@@ -63,6 +66,8 @@
6366
# config.active_job.queue_adapter = :resque
6467
# config.active_job.queue_name_prefix = "active_admin_demo_production"
6568

69+
# Disable caching for Action Mailer templates even if Action Controller
70+
# caching is enabled.
6671
config.action_mailer.perform_caching = false
6772

6873
# Ignore bad email addresses and do not raise email delivery errors.

config/environments/test.rb

+8-5
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
@@ -34,13 +31,19 @@
3431
# Disable request forgery protection in test environment.
3532
config.action_controller.allow_forgery_protection = false
3633

34+
# Disable caching for Action Mailer templates even if Action Controller
35+
# caching is enabled.
3736
config.action_mailer.perform_caching = false
3837

3938
# Tell Action Mailer not to deliver emails to the real world.
4039
# The :test delivery method accumulates sent emails in the
4140
# ActionMailer::Base.deliveries array.
4241
config.action_mailer.delivery_method = :test
4342

43+
# Unlike controllers, the mailer instance doesn't have any context about the
44+
# incoming request so you'll need to provide the :host parameter yourself.
45+
config.action_mailer.default_url_options = { host: "www.example.com" }
46+
4447
# Print deprecation notices to the stderr.
4548
config.active_support.deprecation = :stderr
4649

@@ -56,6 +59,6 @@
5659
# Annotate rendered view with file names.
5760
# config.action_view.annotate_rendered_view_with_filenames = true
5861

59-
# Raise error when a before_action's only/except options reference missing actions
62+
# Raise error when a before_action's only/except options reference missing actions.
6063
config.action_controller.raise_on_missing_callback_actions = true
6164
end

0 commit comments

Comments
 (0)