Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build(deps): Bump rails from 7.0.8 to 7.1.2 #8007

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
# the new version. It is always preferable to upgrade our code.
source 'https://rubygems.org'

gem 'rails', '~> 7.0.8'
gem 'rails', '~> 7.1.2'

gem 'pg', '~> 1.5.4'

Expand Down
172 changes: 102 additions & 70 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ PATH
flipper (~> 0.10)
flipper-active_record (~> 0.10)
mime-types (< 4.0.0)
rails (~> 7.0.4)
rails (>= 7.0.4, < 7.2.0)

PATH
remote: gems/excel_analyzer
Expand All @@ -62,73 +62,82 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
actioncable (7.1.2)
actionpack (= 7.1.2)
activesupport (= 7.1.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8)
actionpack (= 7.0.8)
activejob (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
zeitwerk (~> 2.6)
actionmailbox (7.1.2)
actionpack (= 7.1.2)
activejob (= 7.1.2)
activerecord (= 7.1.2)
activestorage (= 7.1.2)
activesupport (= 7.1.2)
mail (>= 2.7.1)
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)
actionmailer (7.1.2)
actionpack (= 7.1.2)
actionview (= 7.1.2)
activejob (= 7.1.2)
activesupport (= 7.1.2)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8)
actionview (= 7.0.8)
activesupport (= 7.0.8)
rack (~> 2.0, >= 2.2.4)
rails-dom-testing (~> 2.2)
actionpack (7.1.2)
actionview (= 7.1.2)
activesupport (= 7.1.2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.8)
actionpack (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.2)
actionpack (= 7.1.2)
activerecord (= 7.1.2)
activestorage (= 7.1.2)
activesupport (= 7.1.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8)
activesupport (= 7.0.8)
actionview (7.1.2)
activesupport (= 7.1.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
active_model_otp (2.3.2)
activemodel
rotp (~> 6.2.0)
activejob (7.0.8)
activesupport (= 7.0.8)
activejob (7.1.2)
activesupport (= 7.1.2)
globalid (>= 0.3.6)
activemodel (7.0.8)
activesupport (= 7.0.8)
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)
activemodel (7.1.2)
activesupport (= 7.1.2)
activerecord (7.1.2)
activemodel (= 7.1.2)
activesupport (= 7.1.2)
timeout (>= 0.4.0)
activestorage (7.1.2)
actionpack (= 7.1.2)
activejob (= 7.1.2)
activerecord (= 7.1.2)
activesupport (= 7.1.2)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8)
activesupport (7.1.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
Expand Down Expand Up @@ -161,7 +170,9 @@ GEM
faraday (~> 0.9)
faraday_middleware (~> 0.10)
nokogiri (~> 1.6, >= 1.6.8)
base64 (0.2.0)
bcrypt (3.1.20)
bigdecimal (3.1.4)
bindex (0.8.1)
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
Expand Down Expand Up @@ -195,12 +206,14 @@ GEM
daemons (1.4.1)
dalli (3.2.6)
dante (0.2.0)
date (3.3.3)
date (3.3.4)
declarative (0.0.20)
diff-lcs (1.5.0)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
docile (1.4.0)
drb (2.2.0)
ruby2_keywords
erubi (1.12.0)
eventmachine (1.2.7)
exception_notification (4.5.0)
Expand Down Expand Up @@ -288,6 +301,10 @@ GEM
icalendar (2.10.1)
ice_cube (~> 0.16)
ice_cube (0.16.4)
io-console (0.6.0)
irb (1.9.0)
rdoc
reline (>= 0.3.8)
iso_country_codes (0.7.8)
jmespath (1.6.2)
jquery-rails (4.6.0)
Expand Down Expand Up @@ -333,7 +350,8 @@ GEM
i18n (>= 0.6.4, <= 2)
multi_json (1.15.0)
multipart-post (2.3.0)
net-imap (0.3.7)
mutex_m (0.2.0)
net-imap (0.4.4)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -344,7 +362,7 @@ GEM
net-ssh (>= 2.6.5, < 8.0.0)
net-sftp (4.0.0)
net-ssh (>= 5.0.0, < 8.0.0)
net-smtp (0.3.3)
net-smtp (0.4.0)
net-protocol
net-ssh (7.2.1)
net-ssh-gateway (2.0.0)
Expand Down Expand Up @@ -377,27 +395,34 @@ GEM
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
psych (5.1.1.1)
stringio
public_suffix (5.0.4)
racc (1.7.3)
rack (2.2.8)
rack-session (1.0.1)
rack (< 3)
rack-test (2.1.0)
rack (>= 1.3)
rack-utf8_sanitizer (1.9.1)
rack (>= 1.0, < 4.0)
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)
rackup (1.0.0)
rack (< 3)
webrick
rails (7.1.2)
actioncable (= 7.1.2)
actionmailbox (= 7.1.2)
actionmailer (= 7.1.2)
actionpack (= 7.1.2)
actiontext (= 7.1.2)
actionview (= 7.1.2)
activejob (= 7.1.2)
activemodel (= 7.1.2)
activerecord (= 7.1.2)
activestorage (= 7.1.2)
activesupport (= 7.1.2)
bundler (>= 1.15.0)
railties (= 7.0.8)
railties (= 7.1.2)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -412,19 +437,24 @@ GEM
rails-i18n (7.0.5)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
method_source
railties (7.1.2)
actionpack (= 7.1.2)
activesupport (= 7.1.2)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.1.0)
rdoc (6.6.0)
psych (>= 4.0.0)
recaptcha (5.16.0)
redcarpet (3.6.0)
redis (4.8.1)
regexp_parser (2.8.3)
reline (0.4.0)
io-console (~> 0.5)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
Expand Down Expand Up @@ -482,6 +512,7 @@ GEM
rubocop-ast (>= 1.30.0, < 2.0)
ruby-ole (1.2.12.1)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
sass (3.4.25)
sass-rails (5.0.8)
Expand Down Expand Up @@ -515,6 +546,7 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
statistics2 (0.54)
stringio (3.0.9)
stripe (5.55.0)
syck (1.4.1)
syslog_protocol (0.9.2)
Expand All @@ -525,7 +557,7 @@ GEM
rack (>= 1, < 3)
thor (1.3.0)
tilt (2.0.10)
timeout (0.4.0)
timeout (0.4.1)
trailblazer-option (0.1.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -624,7 +656,7 @@ DEPENDENCIES
pry (~> 0.14.2)
rack (~> 2.2.8)
rack-utf8_sanitizer (~> 1.9.1)
rails (~> 7.0.8)
rails (~> 7.1.2)
rails-controller-testing
rails-i18n (~> 7.0.5)
recaptcha (~> 5.16.0)
Expand Down
5 changes: 2 additions & 3 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class Application < Rails::Application
# config.time_zone = "Central Time (US & Canada)"
# config.eager_load_paths << Rails.root.join("extras")
config.autoloader = :zeitwerk
config.active_record.legacy_connection_handling = false
config.active_support.use_rfc4122_namespaced_uuids = true

# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
Expand Down Expand Up @@ -82,8 +81,6 @@ class Application < Rails::Application
config.autoload_paths << "#{Rails.root}/app/controllers/concerns"
config.autoload_paths << "#{Rails.root}/app/models/concerns"

config.enable_dependency_loading = true

# See Rails::Configuration for more options
ENV['RECAPTCHA_SITE_KEY'] = AlaveteliConfiguration.recaptcha_site_key
ENV['RECAPTCHA_SECRET_KEY'] = AlaveteliConfiguration.recaptcha_secret_key
Expand All @@ -100,5 +97,7 @@ class Application < Rails::Application

# Allow the generation of full URLs in emails
config.action_mailer.default_url_options = { host: AlaveteliConfiguration.domain }

config.active_storage.service = :local
end
end
6 changes: 6 additions & 0 deletions config/storage.yml-example
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,9 @@ attachments_test: &attachments_test

attachments:
<<: *attachments_<%= Rails.env %>

## Local ##

local:
service: Disk
root: <%= Rails.root.join('tmp/storage/local') %>
2 changes: 1 addition & 1 deletion gems/alaveteli_features/alaveteli_features.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.add_dependency "rails", "~> 7.0.4"
spec.add_dependency "rails", ">= 7.0.4", "< 7.2.0"
spec.add_dependency "flipper", "~> 0.10"
spec.add_dependency "flipper-active_record", "~> 0.10"
# Mime types 3 needs Ruby 2.0.0 or greater, but we need to support 1.9.3 so
Expand Down
2 changes: 1 addition & 1 deletion lib/no_constraint_disabling.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module ActiveRecord
class FixtureSet
def self.create_fixtures(fixtures_directory, fixture_set_names, class_names = {}, config = ActiveRecord::Base)
fixture_set_names = Array(fixture_set_names).map(&:to_s)
class_names = ClassCache.new class_names, config
class_names.stringify_keys!

# FIXME: Apparently JK uses this.
connection = block_given? ? yield : ActiveRecord::Base.connection
Expand Down
Loading