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

Task/upgrade rails to 7.0.8 #1030

Merged
merged 25 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a354dd1
Update spring gem per rails upgrade guide
jseraf Jan 5, 2024
e58759b
WIP: dev/test gem updates, specs pass
jseraf Jan 8, 2024
d689b28
WIP: remove deprecated return_false_on_aborted_enqueue config as part…
jseraf Jan 8, 2024
62c9752
WIP: remove unused draper gem
jseraf Jan 9, 2024
4f72ff2
WIP: more gem updates
jseraf Jan 9, 2024
07aa256
WIP: update jquery-rails
jseraf Jan 9, 2024
a92798e
WIP: update pagy gem and initializer
jseraf Jan 9, 2024
d3584f0
WIP: Bump ransack gem, fix deprecation message re: sort_link arguments
jseraf Jan 11, 2024
efa867c
WIP: Fix review score sorting to favor submitted reviews
jseraf Jan 12, 2024
cfe6c75
WIP: typo fix
jseraf Jan 12, 2024
cc8d78a
WIP: update discard
jseraf Jan 12, 2024
2d247c8
WIP: update paper_trail gem
jseraf Jan 16, 2024
36b8a8b
WIP: update american_date and validates_timeliness
jseraf Jan 16, 2024
5d93fe7
WIP: update xls related gem, specify wicked_pdf version
jseraf Jan 16, 2024
60a261c
WIP: Upgrade to rails 7.0.8
jseraf Jan 19, 2024
c4102c2
WIP: Fix "Deprecate passing a format to `#to_s` in favor of `#to_fs`"…
jseraf Jan 19, 2024
3ef14b6
WIP: update config per previous commit deprecation warning
jseraf Jan 19, 2024
bb8da08
WIP: Remove last Foundation CSS `abide` reference. After draft submis…
jseraf Jan 19, 2024
900c73a
WIP: misc formatting, clarification
jseraf Jan 19, 2024
901ece5
WIP: spec fixes, formatting
jseraf Jan 19, 2024
64e45f2
Fix draft grant spec on `grant.undiscard`
jseraf Jan 19, 2024
6d3428c
WIP: Remove trix gem in favor of rails native actiontext
jseraf Jan 19, 2024
1a1968c
WIP: actiontext:install
jseraf Jan 19, 2024
67411dd
WIP: to 7.0.8, configs, specs pass
jseraf Jan 24, 2024
b949d10
WIP: Add comment re Date#to_s deprecation and paper_trail
jseraf Jan 25, 2024
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
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