Merge pull request #1071 from Retrospring/dep/rails-7.0.4.2
Bump rails to 7.0.8
This commit is contained in:
Karina Kwiatek
GitHub
commit
e18abd3752
3
Gemfile
3
Gemfile
|
|
@ -3,7 +3,7 @@
|
|||
source "https://rubygems.org"
|
||||
|
||||
gem "i18n-js", "4.0"
|
||||
gem "rails", "~> 6.1"
|
||||
gem "rails", "~> 7.0.8"
|
||||
gem "rails-i18n", "~> 7.0"
|
||||
|
||||
gem "cssbundling-rails", "~> 1.3"
|
||||
|
|
@ -72,7 +72,6 @@ gem "jwt", "~> 2.7"
|
|||
|
||||
group :development do
|
||||
gem "binding_of_caller"
|
||||
gem "spring", "~> 4.1"
|
||||
end
|
||||
|
||||
gem "puma"
|
||||
|
|
|
|||
178
Gemfile.lock
178
Gemfile.lock
|
|
@ -17,40 +17,47 @@ GIT
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actioncable (6.1.7.6)
|
||||
actionpack (= 6.1.7.6)
|
||||
activesupport (= 6.1.7.6)
|
||||
actioncable (7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
actionmailbox (6.1.7.6)
|
||||
actionpack (= 6.1.7.6)
|
||||
activejob (= 6.1.7.6)
|
||||
activerecord (= 6.1.7.6)
|
||||
activestorage (= 6.1.7.6)
|
||||
activesupport (= 6.1.7.6)
|
||||
actionmailbox (7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
activejob (= 7.0.8)
|
||||
activerecord (= 7.0.8)
|
||||
activestorage (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
mail (>= 2.7.1)
|
||||
actionmailer (6.1.7.6)
|
||||
actionpack (= 6.1.7.6)
|
||||
actionview (= 6.1.7.6)
|
||||
activejob (= 6.1.7.6)
|
||||
activesupport (= 6.1.7.6)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
actionmailer (7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
actionview (= 7.0.8)
|
||||
activejob (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (6.1.7.6)
|
||||
actionview (= 6.1.7.6)
|
||||
activesupport (= 6.1.7.6)
|
||||
rack (~> 2.0, >= 2.0.9)
|
||||
actionpack (7.0.8)
|
||||
actionview (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
rack (~> 2.0, >= 2.2.4)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||
actiontext (6.1.7.6)
|
||||
actionpack (= 6.1.7.6)
|
||||
activerecord (= 6.1.7.6)
|
||||
activestorage (= 6.1.7.6)
|
||||
activesupport (= 6.1.7.6)
|
||||
actiontext (7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
activerecord (= 7.0.8)
|
||||
activestorage (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
globalid (>= 0.6.0)
|
||||
nokogiri (>= 1.8.5)
|
||||
actionview (6.1.7.6)
|
||||
activesupport (= 6.1.7.6)
|
||||
actionview (7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
|
|
@ -58,31 +65,30 @@ GEM
|
|||
active_model_otp (2.3.2)
|
||||
activemodel
|
||||
rotp (~> 6.2.0)
|
||||
activejob (6.1.7.6)
|
||||
activesupport (= 6.1.7.6)
|
||||
activejob (7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (6.1.7.6)
|
||||
activesupport (= 6.1.7.6)
|
||||
activemodel (7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
activemodel-serializers-xml (1.0.2)
|
||||
activemodel (> 5.x)
|
||||
activesupport (> 5.x)
|
||||
builder (~> 3.1)
|
||||
activerecord (6.1.7.6)
|
||||
activemodel (= 6.1.7.6)
|
||||
activesupport (= 6.1.7.6)
|
||||
activestorage (6.1.7.6)
|
||||
actionpack (= 6.1.7.6)
|
||||
activejob (= 6.1.7.6)
|
||||
activerecord (= 6.1.7.6)
|
||||
activesupport (= 6.1.7.6)
|
||||
activerecord (7.0.8)
|
||||
activemodel (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
activestorage (7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
activejob (= 7.0.8)
|
||||
activerecord (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
marcel (~> 1.0)
|
||||
mini_mime (>= 1.1.0)
|
||||
activesupport (6.1.7.6)
|
||||
activesupport (7.0.8)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
zeitwerk (~> 2.3)
|
||||
addressable (2.8.5)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
ast (2.4.2)
|
||||
|
|
@ -96,9 +102,9 @@ GEM
|
|||
debug_inspector (>= 0.0.1)
|
||||
bootsnap (1.16.0)
|
||||
msgpack (~> 1.2)
|
||||
bootstrap_form (5.1.0)
|
||||
actionpack (>= 5.2)
|
||||
activemodel (>= 5.2)
|
||||
bootstrap_form (5.3.2)
|
||||
actionpack (>= 6.1)
|
||||
activemodel (>= 6.1)
|
||||
builder (3.2.4)
|
||||
bullet (7.1.2)
|
||||
activesupport (>= 3.0.0)
|
||||
|
|
@ -134,15 +140,15 @@ GEM
|
|||
devise-async (1.0.0)
|
||||
activejob (>= 5.0)
|
||||
devise (>= 4.0)
|
||||
devise-i18n (1.10.3)
|
||||
devise (>= 4.8.0)
|
||||
devise-i18n (1.12.0)
|
||||
devise (>= 4.9.0)
|
||||
diff-lcs (1.5.0)
|
||||
docile (1.4.0)
|
||||
dotenv (2.8.1)
|
||||
dotenv-rails (2.8.1)
|
||||
dotenv (= 2.8.1)
|
||||
railties (>= 3.2)
|
||||
dry-core (1.0.0)
|
||||
dry-core (1.0.1)
|
||||
concurrent-ruby (~> 1.0)
|
||||
zeitwerk (~> 2.6)
|
||||
dry-inflector (1.0.0)
|
||||
|
|
@ -159,7 +165,7 @@ GEM
|
|||
zeitwerk (~> 2.6)
|
||||
erubi (1.12.0)
|
||||
excon (0.104.0)
|
||||
factory_bot (6.2.0)
|
||||
factory_bot (6.2.1)
|
||||
activesupport (>= 5.0.0)
|
||||
factory_bot_rails (6.2.0)
|
||||
factory_bot (~> 6.2.0)
|
||||
|
|
@ -167,9 +173,9 @@ GEM
|
|||
fake_email_validator (1.0.11)
|
||||
activemodel
|
||||
mail
|
||||
faker (3.1.1)
|
||||
faker (3.2.1)
|
||||
i18n (>= 1.8.11, < 2)
|
||||
ffi (1.15.5)
|
||||
ffi (1.16.3)
|
||||
fog-aws (3.21.0)
|
||||
fog-core (~> 2.1)
|
||||
fog-json (~> 1.1)
|
||||
|
|
@ -188,7 +194,7 @@ GEM
|
|||
fog-core
|
||||
nokogiri (>= 1.5.11, < 2.0.0)
|
||||
formatador (1.1.0)
|
||||
glob (0.3.1)
|
||||
glob (0.4.0)
|
||||
globalid (1.2.1)
|
||||
activesupport (>= 6.1)
|
||||
haml (6.2.3)
|
||||
|
|
@ -211,7 +217,7 @@ GEM
|
|||
i18n-js (4.0.0)
|
||||
glob
|
||||
i18n
|
||||
idn-ruby (0.1.4)
|
||||
idn-ruby (0.1.5)
|
||||
image_processing (1.12.2)
|
||||
mini_magick (>= 4.9.5, < 5)
|
||||
ruby-vips (>= 2.0.17, < 3)
|
||||
|
|
@ -234,8 +240,8 @@ GEM
|
|||
kaminari-core (= 1.2.2)
|
||||
kaminari-core (1.2.2)
|
||||
language_server-protocol (3.17.0.3)
|
||||
launchy (2.5.0)
|
||||
addressable (~> 2.7)
|
||||
launchy (2.5.2)
|
||||
addressable (~> 2.8)
|
||||
letter_opener (1.8.1)
|
||||
launchy (>= 2.2, < 3)
|
||||
lograge (0.14.0)
|
||||
|
|
@ -252,7 +258,7 @@ GEM
|
|||
method_source (1.0.0)
|
||||
mime-types (3.5.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2023.0808)
|
||||
mime-types-data (3.2023.1003)
|
||||
mimemagic (0.4.3)
|
||||
nokogiri (~> 1)
|
||||
rake
|
||||
|
|
@ -260,13 +266,13 @@ GEM
|
|||
mini_mime (1.1.5)
|
||||
mini_portile2 (2.8.4)
|
||||
minitest (5.20.0)
|
||||
msgpack (1.6.0)
|
||||
msgpack (1.7.2)
|
||||
multi_json (1.15.0)
|
||||
multi_xml (0.6.0)
|
||||
nested_form (0.3.2)
|
||||
net-http-persistent (4.0.1)
|
||||
net-http-persistent (4.0.2)
|
||||
connection_pool (~> 2.2)
|
||||
net-http2 (0.18.4)
|
||||
net-http2 (0.18.5)
|
||||
http-2 (~> 0.11)
|
||||
net-imap (0.4.1)
|
||||
date
|
||||
|
|
@ -302,21 +308,20 @@ GEM
|
|||
rack (2.2.8)
|
||||
rack-test (2.1.0)
|
||||
rack (>= 1.3)
|
||||
rails (6.1.7.6)
|
||||
actioncable (= 6.1.7.6)
|
||||
actionmailbox (= 6.1.7.6)
|
||||
actionmailer (= 6.1.7.6)
|
||||
actionpack (= 6.1.7.6)
|
||||
actiontext (= 6.1.7.6)
|
||||
actionview (= 6.1.7.6)
|
||||
activejob (= 6.1.7.6)
|
||||
activemodel (= 6.1.7.6)
|
||||
activerecord (= 6.1.7.6)
|
||||
activestorage (= 6.1.7.6)
|
||||
activesupport (= 6.1.7.6)
|
||||
rails (7.0.8)
|
||||
actioncable (= 7.0.8)
|
||||
actionmailbox (= 7.0.8)
|
||||
actionmailer (= 7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
actiontext (= 7.0.8)
|
||||
actionview (= 7.0.8)
|
||||
activejob (= 7.0.8)
|
||||
activemodel (= 7.0.8)
|
||||
activerecord (= 7.0.8)
|
||||
activestorage (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
bundler (>= 1.15.0)
|
||||
railties (= 6.1.7.6)
|
||||
sprockets-rails (>= 2.0.0)
|
||||
railties (= 7.0.8)
|
||||
rails-controller-testing (1.0.5)
|
||||
actionpack (>= 5.0.1.rc1)
|
||||
actionview (>= 5.0.1.rc1)
|
||||
|
|
@ -337,16 +342,17 @@ GEM
|
|||
nested_form (~> 0.3)
|
||||
rails (>= 6.0, < 8)
|
||||
turbo-rails (~> 1.0)
|
||||
railties (6.1.7.6)
|
||||
actionpack (= 6.1.7.6)
|
||||
activesupport (= 6.1.7.6)
|
||||
railties (7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
method_source
|
||||
rake (>= 12.2)
|
||||
thor (~> 1.0)
|
||||
zeitwerk (~> 2.5)
|
||||
rainbow (3.1.1)
|
||||
rake (13.0.6)
|
||||
redcarpet (3.6.0)
|
||||
redis (4.8.0)
|
||||
redis (4.8.1)
|
||||
regexp_parser (2.8.2)
|
||||
request_store (1.5.1)
|
||||
rack (>= 1.4)
|
||||
|
|
@ -356,7 +362,7 @@ GEM
|
|||
rexml (3.2.6)
|
||||
rolify (6.0.1)
|
||||
rotp (6.2.2)
|
||||
rouge (4.1.2)
|
||||
rouge (4.1.3)
|
||||
rpush (7.0.1)
|
||||
activesupport (>= 5.2)
|
||||
jwt (>= 1.5.6)
|
||||
|
|
@ -415,7 +421,7 @@ GEM
|
|||
rack (>= 1.1)
|
||||
rubocop (>= 1.33.0, < 2.0)
|
||||
ruby-progressbar (1.13.0)
|
||||
ruby-vips (2.1.4)
|
||||
ruby-vips (2.2.0)
|
||||
ffi (~> 1.12)
|
||||
rubyzip (2.3.2)
|
||||
sanitize (6.1.0)
|
||||
|
|
@ -429,17 +435,17 @@ GEM
|
|||
sprockets (> 3.0)
|
||||
sprockets-rails
|
||||
tilt
|
||||
sentry-rails (5.10.0)
|
||||
sentry-rails (5.12.0)
|
||||
railties (>= 5.0)
|
||||
sentry-ruby (~> 5.10.0)
|
||||
sentry-ruby (5.10.0)
|
||||
sentry-ruby (~> 5.12.0)
|
||||
sentry-ruby (5.12.0)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
sentry-sidekiq (5.10.0)
|
||||
sentry-ruby (~> 5.10.0)
|
||||
sentry-sidekiq (5.12.0)
|
||||
sentry-ruby (~> 5.12.0)
|
||||
sidekiq (>= 3.0)
|
||||
shoulda-matchers (5.3.0)
|
||||
activesupport (>= 5.2.0)
|
||||
sidekiq (6.5.8)
|
||||
sidekiq (6.5.12)
|
||||
connection_pool (>= 2.2.5, < 3)
|
||||
rack (~> 2.0)
|
||||
redis (>= 4.5.0, < 5)
|
||||
|
|
@ -455,7 +461,6 @@ GEM
|
|||
json
|
||||
simplecov
|
||||
simplecov_json_formatter (0.1.4)
|
||||
spring (4.1.1)
|
||||
sprockets (4.2.1)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (>= 2.2.4, < 4)
|
||||
|
|
@ -465,7 +470,7 @@ GEM
|
|||
sprockets (>= 3.0.0)
|
||||
sysexits (1.2.0)
|
||||
temple (0.10.3)
|
||||
thor (1.2.2)
|
||||
thor (1.3.0)
|
||||
tilt (2.3.0)
|
||||
timeout (0.4.0)
|
||||
tldv (0.1.0)
|
||||
|
|
@ -482,7 +487,7 @@ GEM
|
|||
concurrent-ruby (~> 1.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.8)
|
||||
unf_ext (0.0.8.2)
|
||||
unicode-display_width (2.5.0)
|
||||
uniform_notifier (1.16.0)
|
||||
view_component (3.6.0)
|
||||
|
|
@ -551,7 +556,7 @@ DEPENDENCIES
|
|||
puma
|
||||
pundit (~> 2.3)
|
||||
questiongenerator (~> 1.1)
|
||||
rails (~> 6.1)
|
||||
rails (~> 7.0.8)
|
||||
rails-controller-testing
|
||||
rails-i18n (~> 7.0)
|
||||
rails_admin
|
||||
|
|
@ -578,7 +583,6 @@ DEPENDENCIES
|
|||
simplecov
|
||||
simplecov-cobertura
|
||||
simplecov-json
|
||||
spring (~> 4.1)
|
||||
sprockets (~> 4.2)
|
||||
sprockets-rails
|
||||
tldv (~> 0.1.0)
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
// This is a stub so that we don't have to install actiontext
|
||||
|
|
@ -0,0 +1 @@
|
|||
// This is a stub so that we don't have to install Trix
|
||||
|
|
@ -0,0 +1 @@
|
|||
// This is a stub so that we don't have to install Trix
|
||||
|
|
@ -56,7 +56,7 @@ class TypoedEmailValidator < ActiveModel::EachValidator
|
|||
|
||||
# check if the TLD is valid
|
||||
tld = domain_parts.last
|
||||
return false unless TLDv.valid?(tld)
|
||||
return false unless TLDv.valid?(tld) || (Rails.env.test? && %w[example test].include?(tld))
|
||||
|
||||
# finally, common typos
|
||||
return false if INVALID_ENDINGS.any? { value.end_with?(_1) }
|
||||
|
|
|
|||
|
|
@ -27,12 +27,14 @@ module Justask
|
|||
# Application configuration should go into files in config/initializers
|
||||
# -- all .rb files in that directory are automatically loaded.
|
||||
|
||||
config.load_defaults 6.0
|
||||
config.load_defaults 7.0
|
||||
# add `lib/` to the autoload paths so zeitwerk can find e.g. our `UseCase`s
|
||||
# without an explicit `require`, and also take care of hot reloading the code
|
||||
# (really useful in development!)
|
||||
config.autoload_paths << config.root.join("lib")
|
||||
config.autoload_once_paths << config.root.join("lib")
|
||||
config.eager_load_paths << config.root.join("lib")
|
||||
# This lowers memory usage from Bootsnap
|
||||
config.add_autoload_paths_to_load_path = false
|
||||
|
||||
# Use Sidekiq for background jobs
|
||||
config.active_job.queue_adapter = :sidekiq
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
Rails.application.config.after_initialize do
|
||||
Rails.application.config.action_dispatch.cookies_rotations.tap do |cookies|
|
||||
salt = Rails.application.config.action_dispatch.authenticated_encrypted_cookie_salt
|
||||
secret_key_base = Rails.application.secret_key_base
|
||||
|
||||
key_generator = ActiveSupport::KeyGenerator.new(
|
||||
secret_key_base, iterations: 1000, hash_digest_class: OpenSSL::Digest::SHA1
|
||||
)
|
||||
key_len = ActiveSupport::MessageEncryptor.key_len
|
||||
secret = key_generator.generate_key(salt, key_len)
|
||||
|
||||
cookies.rotate :encrypted, secret
|
||||
end
|
||||
end
|
||||
Loading…
Reference in New Issue