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

Rails 7.1 #2431

Merged
merged 21 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
bf5fb3c
Rails 7.1 requires explicit require of active_job/log_subscriber for …
jrochkind Nov 8, 2023
7a16a17
Rails 7.1, plus updates to blacklight, qa, and browse_everything nec…
jrochkind Nov 8, 2023
9fa9173
move restricted derivatives to factory and stop using #dup on ActiveR…
jrochkind Nov 8, 2023
f2fb9d6
fix param check for Rails 7.1 where inner hash is also an ActionContr…
jrochkind Nov 8, 2023
56024fc
more comments on rack 2.x lock
jrochkind Nov 9, 2023
c5c0ece
Add linux platform to Gemfile.lock
jrochkind Nov 9, 2023
b70bd06
update Rails 7.1.1=>7.1.2
jrochkind Nov 13, 2023
977a446
Update config files to be closer to what would be generated by Rails 7.1
jrochkind Nov 9, 2023
f2c9c32
update Rails defaults to 7.0; 7.1 is causing some test failures not s…
jrochkind Nov 9, 2023
61f16a9
Tell devise where to get secret_key_base to avoid Rails 7.1 deprecati…
jrochkind Nov 9, 2023
9d0b2ad
stop using deprecated secrets.yml to set secret_key_base from env
jrochkind Nov 9, 2023
7512c1a
Rails 7.0 defaults require allow_other_host for redirects to non-app …
jrochkind Nov 13, 2023
b34682e
add Rails 7.1 new framework defaults initializer, initially all comme…
jrochkind Nov 13, 2023
4ba968d
opt into some non-dangerous Rails config 7.1 defaults
jrochkind Nov 13, 2023
5132af6
opt into more innocuous Rails 7.1 defaults
jrochkind Nov 13, 2023
ee0afce
Opt into new Rails 7.1 defaults around activerecord callbacks
jrochkind Nov 13, 2023
502bf45
make new run_after_transaction_callbacks_in_order_defined config actu…
jrochkind Nov 21, 2023
c139c4b
use new kithe feature #kithe_earlier_after_commit to regsiter our aft…
jrochkind Nov 21, 2023
0f0692e
in CI change db:create to db:prepare
jrochkind Nov 22, 2023
cad8a5a
use db:test:prepare instead of db:prepare in CI, will likely be faste…
jrochkind Nov 27, 2023
d172acc
Merge pull request #2439 from sciencehistory/rails_7.1_config_and_dep…
jrochkind Nov 27, 2023
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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

- name: Set up app
run: |
RAILS_ENV=test bundle exec rails db:create
RAILS_ENV=test bundle exec rails db:test:prepare
yarn install

# This cache probably doesn't actually save us any time, but it hopes to save
Expand Down
16 changes: 11 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ ruby "~> #{File.read(File.join(__dir__ , '.ruby-version')).chomp.split('.').slic
gem 'lockbox'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.0.0'
gem 'rails', '~> 7.1.0'

# While rails 7.1 supports rack 3, other things we're using actually don't yet,
# but bundler can incorrectly resolve to REALLY OLD verisons of dependencies
# if we don't tell it, actually, we're not ready for rack 3. See:
# https://bibwild.wordpress.com/2023/11/09/beware-sinatra-rails-7-1-rack-3-resque-bundler-dependency-resolution/
gem "rack", "~> 2.0"

# Our JS/CSS/asset bundler
# After updating, you always need to run `bundle exec vite upgrade` to update JS packages to match
Expand Down Expand Up @@ -43,7 +49,7 @@ gem 'scout_apm'
# NOTE ALSO: We are using `blacklight-frontend` JS NPM package, updating blacklight
# version may require an update with yarn to `blacklight-frontend`, has to be
# checked manually.
gem "blacklight", "~> 7.34.0"
gem "blacklight", "~> 7.35.0"
gem "blacklight_range_limit", "~> 8.4.0" # version no longer sync'd with blacklight, not sure how we tell what version works with what version of BL

# for some code to deal with transcoding video, via AWS MediaConvert
Expand Down Expand Up @@ -111,14 +117,14 @@ gem "device_detector", "~> 1.0" # user-agent parsing we use for logging

gem "attr_json", "~> 2.0"

gem 'kithe', "~> 2.11"
gem 'kithe', "~> 2.13"

gem "traject", ">= 3.5" # to include support for HTTP basic auth in Solr url

gem 'simple_form', "~> 5.0"

gem "browse-everything", "~> 1.2"
gem "qa", "~> 5.2", ">= 5.2.10"
gem "browse-everything", "~> 1.3"
gem "qa", "~> 5.2", ">= 5.11.0"
gem "shrine", "~> 3.3" #, path: "../shrine"
# shrine-compat endpoint to get uppy to direct upload to S3 with resumable multi-part upload
gem "uppy-s3_multipart"
Expand Down
Loading