Skip to content

Commit

Permalink
Task/upgrade rails to 7.0.8 (#1030)
Browse files Browse the repository at this point in the history
* WIP: Update spring gem per rails upgrade guide

* WIP: dev/test gem updates, specs pass

* WIP: remove deprecated return_false_on_aborted_enqueue config as part of rails upgrade

* WIP: remove unused draper gem

* WIP: more gem updates

* WIP: update jquery-rails

* WIP: update pagy gem and initializer

* WIP: Bump ransack gem, fix deprecation message re: sort_link arguments

* WIP: Fix review score sorting to favor submitted reviews

* WIP: update discard

* WIP: update paper_trail gem

* WIP: update american_date and validates_timeliness

* WIP: update xls related gem, specify wicked_pdf version

* WIP: Upgrade to rails 7.0.8

* WIP: Fix "Deprecate passing a format to `#to_s` in favor of `#to_fs`" warnings

* WIP: update config per previous commit deprecation warning

* WIP: Remove last Foundation CSS `abide` reference. After draft submission added, form should submit regardless

* WIP: misc formatting, clarification

* WIP: spec fixes, formatting

* Fix draft grant spec on `grant.undiscard`

* WIP: Remove trix gem in favor of rails native actiontext

* WIP: actiontext:install

* WIP:  to 7.0.8, configs, specs pass

* WIP: Add comment re Date#to_s deprecation and paper_trail
  • Loading branch information
jseraf authored Jan 25, 2024
1 parent 93f88c6 commit 0d149e3
Show file tree
Hide file tree
Showing 62 changed files with 737 additions and 722 deletions.
68 changes: 30 additions & 38 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

gem 'pg'
gem 'rails', '6.1.7.6'
gem 'rails', '~> 7.0.8'

# Use SCSS for stylesheets
gem 'sass-rails', '>= 5'
Expand All @@ -26,35 +26,33 @@ gem 'requestjs-rails'
gem 'turbo-rails', '~> 1.4.0'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false
gem 'bootsnap', '>= 1.17.0', require: false

gem 'devise', '>= 4.8.1'
gem 'devise_saml_authenticatable', '~> 1.9.0'
gem 'draper'
gem 'pundit'
gem 'rubyzip', '~> 2.3.0'
gem 'devise', '4.9.3'
gem 'devise_saml_authenticatable', '~> 1.9.1'
gem 'pundit', '~> 2.3.1'
gem 'rubyzip', '~> 2.3.2'

# frontend
gem 'font-awesome-rails'
gem 'foundation-rails', '~> 6.5.3.0'
gem 'foundation-rails', '~> 6.5.3.0'
gem 'foundation-datepicker-rails'
gem 'friendly_id', '~> 5.4.0'
gem 'haml-rails', '~> 2.0.1'
gem 'jquery-rails', '>= 4.3.5'
gem 'friendly_id', '~> 5.5.0'
gem 'haml-rails', '~> 2.0'
gem 'jquery-rails', '~> 4.6.0'
gem 'jquery-ui-rails'
gem 'pagy', '~> 4.10.1'
gem 'ransack', github: 'activerecord-hackery/ransack'
gem 'pagy', '~> 6.2.0'
gem 'ransack', '~> 3.2.1'
gem 'sprockets-es6'
gem 'trix'

# audits
gem 'discard', '~> 1.2'
gem 'paper_trail', '11.1'
gem 'discard', '~> 1.3'
gem 'paper_trail', '~> 15.1.0'

gem 'exception_notification'

gem 'american_date'
gem 'validates_timeliness', '6.0.0.alpha1'
gem 'american_date', '~> 1.3'
gem 'validates_timeliness', '7.0.0.beta2'

# form_builder
gem "cocoon"
Expand All @@ -65,16 +63,17 @@ gem "nested_form"
gem "aws-sdk-s3", require: false

# exports
gem 'caxlsx'
gem 'caxlsx', '~> 3.3'
gem 'caxlsx_rails'
gem 'wicked_pdf'
gem 'wkhtmltopdf-binary'
gem 'wicked_pdf', '~> 2.1.0'
gem 'wkhtmltopdf-binary', '~> 0.12.6'

group :development, :test do
gem 'awesome_print'
gem 'byebug', platforms: %i[mri mingw x64_mingw]
gem 'puma', '~> 4.3.12'
gem 'webrick', '1.7.0'
gem 'puma', '~> 5.6.8'
gem 'rspec-rails', '6.1'
gem 'webrick', '1.8.1'
end

group :development do
Expand All @@ -84,10 +83,9 @@ group :development do
gem 'bullet'
gem 'i18n-debug'
gem 'listen', '~> 3.5.1'
gem 'rspec-rails', '~> 5.0.0'
gem 'rubocop'
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'spring', '~> 4.0.0'
gem 'spring-watcher-listen', '~> 2.1.0'
gem 'web-console', '>= 3.3.0'

# Use Capistrano for deployment
Expand All @@ -99,21 +97,15 @@ group :development do
end

group :test do
gem 'capybara'
gem 'capybara', '~> 3.39.2'
gem 'capybara-select-2'
gem 'factory_bot_rails'
gem 'faker', git: 'https://github.com/stympy/faker.git', branch: 'master'
gem 'pundit-matchers', '~> 1.6.0'
gem 'rspec'
gem 'faker', '~> 3.2.2'
gem 'pundit-matchers', '~> 3.1.2'
gem 'rspec', '3.12.0'
gem 'rails-controller-testing'
gem 'selenium-webdriver'
gem 'simplecov', require: false

# gem 'rspec-rails', git: 'https://github.com/rspec/rspec-rails', branch: 'main'
# gem 'rspec-core', git: 'https://github.com/rspec/rspec-core', branch: 'main'
# gem 'rspec-expectations', git: 'https://github.com/rspec/rspec-expectations', branch: 'main'
# gem 'rspec-mocks', git: 'https://github.com/rspec/rspec-mocks', branch: 'main'
# gem 'rspec-support', git: 'https://github.com/rspec/rspec-support', branch: 'main'
gem 'selenium-webdriver', '~> 4.16.0'
gem 'simplecov', '~> 0.22', require: false
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down
Loading

0 comments on commit 0d149e3

Please sign in to comment.