Skip to content

Commit 02ee406

Browse files
authored
Merge pull request #554 from better-together-org/dependabot/bundler/rails-7.1.3.4
Bump rails from 7.0.8.3 to 7.1.3.4
2 parents 0b32c3e + 8142fd2 commit 02ee406

File tree

7 files changed

+117
-94
lines changed

7 files changed

+117
-94
lines changed

Gemfile.lock

Lines changed: 96 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -39,75 +39,84 @@ PATH
3939
GEM
4040
remote: https://rubygems.org/
4141
specs:
42-
actioncable (7.0.8.4)
43-
actionpack (= 7.0.8.4)
44-
activesupport (= 7.0.8.4)
42+
actioncable (7.1.3.4)
43+
actionpack (= 7.1.3.4)
44+
activesupport (= 7.1.3.4)
4545
nio4r (~> 2.0)
4646
websocket-driver (>= 0.6.1)
47-
actionmailbox (7.0.8.4)
48-
actionpack (= 7.0.8.4)
49-
activejob (= 7.0.8.4)
50-
activerecord (= 7.0.8.4)
51-
activestorage (= 7.0.8.4)
52-
activesupport (= 7.0.8.4)
47+
zeitwerk (~> 2.6)
48+
actionmailbox (7.1.3.4)
49+
actionpack (= 7.1.3.4)
50+
activejob (= 7.1.3.4)
51+
activerecord (= 7.1.3.4)
52+
activestorage (= 7.1.3.4)
53+
activesupport (= 7.1.3.4)
5354
mail (>= 2.7.1)
5455
net-imap
5556
net-pop
5657
net-smtp
57-
actionmailer (7.0.8.4)
58-
actionpack (= 7.0.8.4)
59-
actionview (= 7.0.8.4)
60-
activejob (= 7.0.8.4)
61-
activesupport (= 7.0.8.4)
58+
actionmailer (7.1.3.4)
59+
actionpack (= 7.1.3.4)
60+
actionview (= 7.1.3.4)
61+
activejob (= 7.1.3.4)
62+
activesupport (= 7.1.3.4)
6263
mail (~> 2.5, >= 2.5.4)
6364
net-imap
6465
net-pop
6566
net-smtp
66-
rails-dom-testing (~> 2.0)
67-
actionpack (7.0.8.4)
68-
actionview (= 7.0.8.4)
69-
activesupport (= 7.0.8.4)
70-
rack (~> 2.0, >= 2.2.4)
67+
rails-dom-testing (~> 2.2)
68+
actionpack (7.1.3.4)
69+
actionview (= 7.1.3.4)
70+
activesupport (= 7.1.3.4)
71+
nokogiri (>= 1.8.5)
72+
racc
73+
rack (>= 2.2.4)
74+
rack-session (>= 1.0.1)
7175
rack-test (>= 0.6.3)
72-
rails-dom-testing (~> 2.0)
73-
rails-html-sanitizer (~> 1.0, >= 1.2.0)
74-
actiontext (7.0.8.4)
75-
actionpack (= 7.0.8.4)
76-
activerecord (= 7.0.8.4)
77-
activestorage (= 7.0.8.4)
78-
activesupport (= 7.0.8.4)
76+
rails-dom-testing (~> 2.2)
77+
rails-html-sanitizer (~> 1.6)
78+
actiontext (7.1.3.4)
79+
actionpack (= 7.1.3.4)
80+
activerecord (= 7.1.3.4)
81+
activestorage (= 7.1.3.4)
82+
activesupport (= 7.1.3.4)
7983
globalid (>= 0.6.0)
8084
nokogiri (>= 1.8.5)
81-
actionview (7.0.8.4)
82-
activesupport (= 7.0.8.4)
85+
actionview (7.1.3.4)
86+
activesupport (= 7.1.3.4)
8387
builder (~> 3.1)
84-
erubi (~> 1.4)
85-
rails-dom-testing (~> 2.0)
86-
rails-html-sanitizer (~> 1.1, >= 1.2.0)
87-
activejob (7.0.8.4)
88-
activesupport (= 7.0.8.4)
88+
erubi (~> 1.11)
89+
rails-dom-testing (~> 2.2)
90+
rails-html-sanitizer (~> 1.6)
91+
activejob (7.1.3.4)
92+
activesupport (= 7.1.3.4)
8993
globalid (>= 0.3.6)
90-
activemodel (7.0.8.4)
91-
activesupport (= 7.0.8.4)
92-
activerecord (7.0.8.4)
93-
activemodel (= 7.0.8.4)
94-
activesupport (= 7.0.8.4)
94+
activemodel (7.1.3.4)
95+
activesupport (= 7.1.3.4)
96+
activerecord (7.1.3.4)
97+
activemodel (= 7.1.3.4)
98+
activesupport (= 7.1.3.4)
99+
timeout (>= 0.4.0)
95100
activerecord-import (1.7.0)
96101
activerecord (>= 4.2)
97-
activerecord-postgis-adapter (8.0.3)
98-
activerecord (~> 7.0.0)
102+
activerecord-postgis-adapter (9.0.2)
103+
activerecord (~> 7.1.0)
99104
rgeo-activerecord (~> 7.0.0)
100-
activestorage (7.0.8.4)
101-
actionpack (= 7.0.8.4)
102-
activejob (= 7.0.8.4)
103-
activerecord (= 7.0.8.4)
104-
activesupport (= 7.0.8.4)
105+
activestorage (7.1.3.4)
106+
actionpack (= 7.1.3.4)
107+
activejob (= 7.1.3.4)
108+
activerecord (= 7.1.3.4)
109+
activesupport (= 7.1.3.4)
105110
marcel (~> 1.0)
106-
mini_mime (>= 1.1.0)
107-
activesupport (7.0.8.4)
111+
activesupport (7.1.3.4)
112+
base64
113+
bigdecimal
108114
concurrent-ruby (~> 1.0, >= 1.0.2)
115+
connection_pool (>= 2.2.5)
116+
drb
109117
i18n (>= 1.6, < 2)
110118
minitest (>= 5.1)
119+
mutex_m
111120
tzinfo (~> 2.0)
112121
addressable (2.8.6)
113122
public_suffix (>= 2.0.2, < 6.0)
@@ -207,6 +216,7 @@ GEM
207216
docile (1.4.0)
208217
domain_name (0.5.20190701)
209218
unf (>= 0.0.5, < 1.0.0)
219+
drb (2.2.1)
210220
dry-auto_inject (1.0.1)
211221
dry-core (~> 1.0)
212222
zeitwerk (~> 2.6)
@@ -270,6 +280,10 @@ GEM
270280
actionpack (>= 6.0.0)
271281
activesupport (>= 6.0.0)
272282
railties (>= 6.0.0)
283+
io-console (0.7.2)
284+
irb (1.13.1)
285+
rdoc (>= 4.0.0)
286+
reline (>= 0.4.2)
273287
jmespath (1.6.2)
274288
json (2.7.2)
275289
json-schema (4.3.0)
@@ -309,6 +323,7 @@ GEM
309323
mobility (~> 1.2)
310324
msgpack (1.7.2)
311325
multi_json (1.15.0)
326+
mutex_m (0.2.0)
312327
net-imap (0.4.12)
313328
date
314329
net-protocol
@@ -333,50 +348,58 @@ GEM
333348
pry (0.14.2)
334349
coderay (~> 1.1)
335350
method_source (~> 1.0)
351+
psych (5.1.2)
352+
stringio
336353
public_suffix (5.0.5)
337354
puma (6.4.2)
338355
nio4r (~> 2.0)
339356
pundit (2.3.2)
340357
activesupport (>= 3.0.0)
341358
racc (1.8.0)
342-
rack (2.2.9)
359+
rack (3.0.11)
343360
rack-cors (2.0.2)
344361
rack (>= 2.0.0)
345362
rack-mini-profiler (3.3.1)
346363
rack (>= 1.2.0)
364+
rack-session (2.0.0)
365+
rack (>= 3.0.0)
347366
rack-protection (3.2.0)
348367
base64 (>= 0.1.0)
349368
rack (~> 2.2, >= 2.2.4)
350369
rack-test (2.1.0)
351370
rack (>= 1.3)
352-
rails (7.0.8.4)
353-
actioncable (= 7.0.8.4)
354-
actionmailbox (= 7.0.8.4)
355-
actionmailer (= 7.0.8.4)
356-
actionpack (= 7.0.8.4)
357-
actiontext (= 7.0.8.4)
358-
actionview (= 7.0.8.4)
359-
activejob (= 7.0.8.4)
360-
activemodel (= 7.0.8.4)
361-
activerecord (= 7.0.8.4)
362-
activestorage (= 7.0.8.4)
363-
activesupport (= 7.0.8.4)
371+
rackup (2.1.0)
372+
rack (>= 3)
373+
webrick (~> 1.8)
374+
rails (7.1.3.4)
375+
actioncable (= 7.1.3.4)
376+
actionmailbox (= 7.1.3.4)
377+
actionmailer (= 7.1.3.4)
378+
actionpack (= 7.1.3.4)
379+
actiontext (= 7.1.3.4)
380+
actionview (= 7.1.3.4)
381+
activejob (= 7.1.3.4)
382+
activemodel (= 7.1.3.4)
383+
activerecord (= 7.1.3.4)
384+
activestorage (= 7.1.3.4)
385+
activesupport (= 7.1.3.4)
364386
bundler (>= 1.15.0)
365-
railties (= 7.0.8.4)
387+
railties (= 7.1.3.4)
366388
rails-dom-testing (2.2.0)
367389
activesupport (>= 5.0.0)
368390
minitest
369391
nokogiri (>= 1.6)
370392
rails-html-sanitizer (1.6.0)
371393
loofah (~> 2.21)
372394
nokogiri (~> 1.14)
373-
railties (7.0.8.4)
374-
actionpack (= 7.0.8.4)
375-
activesupport (= 7.0.8.4)
376-
method_source
395+
railties (7.1.3.4)
396+
actionpack (= 7.1.3.4)
397+
activesupport (= 7.1.3.4)
398+
irb
399+
rackup (>= 1.0.0)
377400
rake (>= 12.2)
378-
thor (~> 1.0)
379-
zeitwerk (~> 2.5)
401+
thor (~> 1.0, >= 1.2.2)
402+
zeitwerk (~> 2.6)
380403
rainbow (3.1.1)
381404
rake (13.2.1)
382405
rb-fsevent (0.11.2)
@@ -387,6 +410,8 @@ GEM
387410
ffi (>= 1.0.6)
388411
msgpack (>= 0.4.3)
389412
optimist (>= 3.0.0)
413+
rdoc (6.7.0)
414+
psych (>= 4.0.0)
390415
redis (5.2.0)
391416
redis-client (>= 0.22.0)
392417
redis-client (0.22.2)
@@ -399,6 +424,8 @@ GEM
399424
activemodel (>= 5.0)
400425
reform (>= 2.3.1, < 3.0.0)
401426
regexp_parser (2.9.2)
427+
reline (0.5.8)
428+
io-console (~> 0.5)
402429
representable (3.2.0)
403430
declarative (< 0.1.0)
404431
trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -530,6 +557,7 @@ GEM
530557
stackprof (0.2.26)
531558
stimulus-rails (1.3.3)
532559
railties (>= 6.0.0)
560+
stringio (3.1.0)
533561
strscan (3.1.0)
534562
sync (0.5.0)
535563
term-ansicolor (1.7.1)
@@ -565,6 +593,7 @@ GEM
565593
activemodel (>= 6.0.0)
566594
bindex (>= 0.4.0)
567595
railties (>= 6.0.0)
596+
webrick (1.8.1)
568597
webdrivers (5.2.0)
569598
nokogiri (~> 1.6)
570599
rubyzip (>= 1.3.0)

config/initializers/action_text.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# frozen_string_literal: true
22

33
Rails.application.config.after_initialize do
4-
ActionText::ContentHelper.allowed_attributes << 'style'
4+
# Example of safe array modification
5+
if ActionText::ContentHelper.allowed_attributes.frozen?
6+
ActionText::ContentHelper.allowed_attributes = ActionText::ContentHelper.allowed_attributes.to_a + ['style']
7+
else
8+
ActionText::ContentHelper.allowed_attributes << 'style'
9+
end
510
end

config/initializers/devise.rb

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,9 @@
1414
# confirmation, reset password and unlock tokens in the database.
1515
# Devise will use the `secret_key_base` as its `secret_key`
1616
# by default. You can change it below and use your own secret key.
17-
config.secret_key = ENV.fetch(
18-
'DEVISE_SECRET',
19-
'fe066f312d07ecef37a5ae4db05e94b0659ef63f600df6e602380e244647b198eaa4d1d5d566f614b77552ad84104983d49f25b45122f7d0ff'
20-
)
17+
config.secret_key = ENV.fetch('DEVISE_SECRET', nil)
2118

22-
config.pepper = ENV.fetch(
23-
'DEVISE_PEPPER',
24-
'9ebf452639e24c753af6eb4877933a620afa2fd1a031a6360be14fbf3828a55729b04adb64c860e097656fe2169474711b85bbafa9feadf510'
25-
)
19+
config.pepper = ENV.fetch('DEVISE_PEPPER', nil)
2620

2721
# ==> Controller configuration
2822
# Configure the parent class to the devise controllers.
@@ -318,10 +312,7 @@
318312
# config.sign_in_after_change_password = true
319313

320314
config.jwt do |jwt|
321-
jwt.secret = ENV.fetch(
322-
'DEVISE_SECRET',
323-
'fe066f312d07ecef37a5ae4db05e94b0659ef63f600df6e602380e244647b198eaa4d1d5d566f614b77552ad84104983d49f25b45122f7d0'
324-
)
315+
jwt.secret = ENV.fetch('DEVISE_SECRET', nil)
325316
jwt.dispatch_requests = [
326317
['POST', %r{^/bt/api/auth/sign-in$}]
327318
]

lib/better_together/engine.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Engine < ::Rails::Engine
2222
engine_name 'better_together'
2323
isolate_namespace BetterTogether
2424

25-
config.autoload_paths << File.expand_path('lib/better_together', __dir__)
25+
config.autoload_paths += Dir["#{config.root}/lib/better_together/**/"]
2626

2727
config.generators do |g|
2828
g.orm :active_record, primary_key_type: :uuid
@@ -54,18 +54,18 @@ class Engine < ::Rails::Engine
5454
config.time_zone = ENV.fetch('APP_TIME_ZONE', 'Newfoundland')
5555

5656
initializer 'better_together.importmap', before: 'importmap' do |app|
57-
app.config.importmap.paths << Engine.root.join('config/importmap.rb')
58-
59-
# Ensure the cache is swept in development and test environments
60-
app.config.importmap.cache_sweepers << root.join('app/assets/javascripts')
61-
app.config.importmap.cache_sweepers << root.join('app/javascript')
57+
# Ensure we are not modifying frozen arrays
58+
app.config.importmap.paths = [Engine.root.join('config/importmap.rb')] + app.config.importmap.paths.to_a
59+
app.config.importmap.cache_sweepers = [root.join('app/assets/javascripts'),
60+
root.join('app/javascript')] + app.config.importmap.cache_sweepers.to_a
6261
end
6362

6463
# Add engine manifest to precompile assets in production
6564
initializer 'better_together.assets' do |app|
65+
# Ensure we are not modifying frozen arrays
6666
app.config.assets.precompile += %w[better_together_manifest.js]
67-
app.config.assets.paths << root.join('app', 'assets', 'images')
68-
app.config.assets.paths << root.join('app', 'javascript')
67+
app.config.assets.paths = [root.join('app', 'assets', 'images'),
68+
root.join('app', 'javascript')] + app.config.assets.paths.to_a
6969
end
7070

7171
initializer 'better_together.turbo' do |app|

spec/dummy/config/application.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class Application < Rails::Application
3131
g.test_framework :rspec
3232
end
3333

34-
config.active_record.legacy_connection_handling = false
35-
3634
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
3735
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
3836
# config.i18n.default_locale = :de

spec/dummy/config/initializers/filter_parameter_logging.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
# Configure parameters to be filtered from the log file. Use this to limit dissemination of
66
# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
77
# notations and behaviors.
8-
Rails.application.config.filter_parameters += %i[
8+
Rails.application.config.filter_parameters = %i[
99
passw secret token _key crypt salt certificate otp ssn
10-
]
10+
] + Rails.application.config.filter_parameters.to_a

spec/dummy/config/secrets.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
# if you're sharing your code publicly.
1212

1313
development:
14-
secret_key_base: 9d31c46cecdb77414fc9a60f93307393b83c81ccb368961ed7d8a2e96c8deab21d1f165a99b8701d58c0b34079b9799bb7734251752f5da68c14f8045aab0105
14+
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
1515

1616
test:
17-
secret_key_base: d7d9c077ce00f9222773a2cdeeb53b0bb54481468bd557314b3f68095d7ec1ee5933737e09efb42ac008baef4e0ba1308f8b5d77e179a136d2b116ad7858646f
17+
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
1818

1919
# Do not keep production secrets in the repository,
2020
# instead read values from the environment.

0 commit comments

Comments
 (0)