Skip to content
Draft
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
4 changes: 2 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ require:
Rails:
Enabled: true
AllCops:
TargetRubyVersion: 3.2.5
TargetRailsVersion: 7.1
TargetRubyVersion: 3.2
TargetRailsVersion: 7.2

Style/StringLiterals:
EnforcedStyle: single_quotes
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
### 1.22.0

**Rails 7.2 Upgrade**
The primary goal of this release is to upgrade the Rails version without causing
any breaking changes to functionality.

* Upgrades Rails 7.1.3.4 to 7.2.3.1
* Some dependency updates/changes allowed or required by the above:
* Upgraded `sprockets` from 3.7.2 to 4.0.3
* Upgraded `papertrail` from 15.1.0 to 17.0.0
* Upgraded `acts-as-taggable-on` from 10.0.0 to 12.0.0

### 1.21.2

**Species+**
Expand Down
44 changes: 23 additions & 21 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source 'https://rubygems.org'
ruby '3.2.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '7.1.3.4'
gem 'rails', '7.2.3.1'

# Configure Cross-Origin resource sharing
gem 'rack-cors'
Expand All @@ -14,15 +14,10 @@ gem 'rack-cors'
gem 'puma', '~> 5.0'

# Use SCSS for stylesheets
# TODO: Can't upgrade sass-rails to 6.0, it raise the following error when running `RAILS_ENV=staging rake assets:precompile`.
# SassC::SyntaxError: Error: Invalid CSS after "...in-bottom:-3px;": expected "}", was ".margin-bottom:-3px"
# on line 3712:5063 of stdin
# >> ction=135,Strength=3)";_margin-bottom:-3px;.margin-bottom:-3px;}/*!Add round
# gem 'sass-rails', '>= 6'
gem 'sass-rails', '~> 5.0'
gem 'sass-rails', '~> 6'

# https://stackoverflow.com/questions/55213868/rails-6-how-to-disable-webpack-and-use-sprockets-instead
gem 'sprockets', '3.7.2'
gem 'sprockets', '~> 4'
gem 'sprockets-rails', require: 'sprockets/railtie'

# Use Terser as compressor for JavaScript assets
Expand All @@ -34,10 +29,10 @@ gem 'coffee-rails', '~> 5.0'
# gem 'mini_racer', platforms: :ruby

gem 'active_model_serializers', '0.8.4' # Deprecated
gem "active_storage_validations", "~> 2.0"
gem 'active_storage_validations', '~> 2.0'

# Use redis for caching
gem "redis", "~> 4.8"
gem 'redis', '~> 4.8'

# Use PostgreSQL database
gem 'pg', '~> 1.5', '>= 1.5.4'
Expand Down Expand Up @@ -70,7 +65,7 @@ gem 'httparty', '~> 0.21.0'

gem 'kaminari', '~> 1.2', '>= 1.2.2' # TODO: Suggest migrate to pagy gem.

gem 'acts-as-taggable-on', '~> 10.0' # TODO: refuses to install against Rails 7.2
gem 'acts-as-taggable-on', '~> 12.0'
gem 'carrierwave', '~> 3.0', '>= 3.0.5'

# PDF
Expand Down Expand Up @@ -98,17 +93,22 @@ gem 'bootsnap', '>= 1.4.4', require: false
# To use Jbuilder templates for JSON
# gem 'jbuilder', '~> 2.7'

gem 'erb', '~> 6.0.2'

group :development do
##
# Adds comments at the top of models describing table column
# (replaces annotate)
gem 'annotaterb', '~> 4.10.2'
gem 'annotaterb', '~> 4.22.0'

##
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 4.1.0'
gem 'web-console'

# Display performance information such as SQL time and flame graphs for each request in your browser.
# Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
gem 'rack-mini-profiler', '~> 2.0'
gem 'listen', '~> 3.3'
gem 'rack-mini-profiler', '~> 4.0.1'
gem 'listen', '~> 3.10.0'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'

Expand Down Expand Up @@ -145,11 +145,15 @@ group :development do
gem 'bcrypt_pbkdf', '1.1.0'
gem 'ed25519', '1.2.4'

# @TODO: bring back when ruby updated to > 2.6 # gem 'net-ssh', '7.0.0.beta1' # openssl 3.0 compatibility @see https://stackoverflow.com/q/72068406/1090438
##
# Static analysis for security vulnerabilities [https://brakemanscanner.org/]
gem 'brakeman', require: false

gem 'net-ssh', '7.3.2'
end

group :test, :development do
gem 'rspec-rails', '~> 6.1', '>= 6.1.1'
gem 'rspec-rails', '~> 7.1'
gem 'rspec-collection_matchers', '~> 1.2', '>= 1.2.1'
gem 'json_spec', '~> 1.1', '>= 1.1.5'
gem 'database_cleaner', '~> 2.0', '>= 2.0.2'
Expand All @@ -166,15 +170,15 @@ group :test do
gem 'webdrivers'

gem 'rails-controller-testing'
gem 'factory_bot_rails', '5.2.0'
gem 'factory_bot_rails', '~> 6.5.1'
gem 'simplecov', '~> 0.22.0', require: false
gem 'coveralls_reborn', '~> 0.28.0', require: false
end

gem 'geoip', '1.3.5' # TODO: no change logs, no idea if safe to update. Latest version is 1.6.4 @ 2018

gem 'request_store', '~> 1.5', '>= 1.5.1'
gem 'paper_trail', '15.1.0'
gem 'paper_trail', '~> 17.0.0'

gem 'dotenv-rails', '2.0.1'

Expand Down Expand Up @@ -229,5 +233,3 @@ gem 'handlebars-source', '1.0.12' # TODO: just a wrapwrapper. Any update will ch
# It might be possible to fix this if we had an nginx version which supported
# the config: `passenger_preload_bundler on;`
gem 'base64', '0.1.1'


Loading