Skip to content

Commit

Permalink
Merge pull request #2247 from coreinfrastructure/revert_rails_8_0
Browse files Browse the repository at this point in the history 
Revert "Merge pull request #2232 from coreinfrastructure/rails_8_0"
  • Loading branch information
@david-a-wheeler
david-a-wheeler authored Dec 23, 2024
2 parents 9e39b56 + 8ba00ed commit 3842206
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 94 deletions.
22 changes: 11 additions & 11 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ ruby File.read('.ruby-version').strip
# Loading only what we use reduces memory use & attack surface.
# gem 'actioncable' # Not used. Client/server comm channel.
# gem 'activestorage' # Not used. Attaches cloud files to ActiveRecord.
gem 'actionmailer', '~> 8.0.1' # Rails. Send email.
gem 'actionpack', '~> 8.0.1' # Rails. MVC framework.
gem 'actionview', '~> 8.0.1' # Rails. View.
gem 'activejob', '~> 8.0.1' # Rails. Async jobs.
gem 'activemodel', '~> 8.0.1' # Rails. Model basics.
gem 'activerecord', '~> 8.0.1' # Rails. ORM and query system.
gem 'actionmailer', '~> 7.2.2' # Rails. Send email.
gem 'actionpack', '~> 7.2.2' # Rails. MVC framework.
gem 'actionview', '~> 7.2.2' # Rails. View.
gem 'activejob', '~> 7.2.2' # Rails. Async jobs.
gem 'activemodel', '~> 7.2.2' # Rails. Model basics.
gem 'activerecord', '~> 7.2.2' # Rails. ORM and query system.
# gem 'activestorage' # Not used. Attaches cloud files to ActiveRecord.
gem 'activesupport', '~> 8.0.1' # Rails. Underlying library.
gem 'activesupport', '~> 7.2.2' # Rails. Underlying library.
# gem 'activetext' # Not used. Text editor that fails to support markdown.
gem 'attr_encrypted', '~> 4'
gem 'bcrypt', '~> 3.1.18' # Security - for salted hashed interacted passwords
Expand Down Expand Up @@ -81,7 +81,7 @@ gem 'omniauth-github', '~> 2.0' # Authentication to GitHub (get project info)
gem 'omniauth-rails_csrf_protection'
gem 'pagy', '~> 6.0'
gem 'paleta', '~> 0.3' # Color manipulation, used for badges
gem 'paper_trail', '~> 16.0' # Record previous versions of project data
gem 'paper_trail', '~> 15.2.0' # Record previous versions of project data
gem 'pg', '~> 1.4' # PostgreSQL database, used for data storage
gem 'pg_search', '~> 2.3' # PostgreSQL full-text search
gem 'puma', '~> 6.5' # Faster webserver; recommended by Heroku
Expand All @@ -93,8 +93,8 @@ gem 'rack-headers_filter', '~> 0.0.1' # Filter out "dangerous" headers
# but instead load only what we use (to reduce memory use and attack surface).
# We load sprockets-rails, but its version number isn't kept in sync.
# Note: Update the gem versions of action* and railties in sync.
gem 'railties', '~> 8.0.1' # Rails. Rails core, loads rest of Rails
gem 'rails-i18n', '~> 8.0.1' # Localizations for Rails built-ins
gem 'railties', '~> 7.2.2' # Rails. Rails core, loads rest of Rails
gem 'rails-i18n', '~> 7.0.10' # Localizations for Rails built-ins # not 7.2.2
gem 'redcarpet', '~> 3.5' # Process markdown in form textareas (justifications)
gem 'sassc-rails' # compiles .scss (css replacement) drop-in replacement for sass-rails
gem 'scout_apm' # Monitor for memory leaks
Expand Down Expand Up @@ -151,7 +151,7 @@ group :development do
# We bring in full rails in development in case we need it for debugging;
# this also keeps some gems happy that don't realize that loading
# only *parts* of Rails is fine:
gem 'rails', '~> 8.0.1' # Rails (our web framework)
gem 'rails', '~> 7.2.2' # Rails (our web framework)
# To update the translation gem, see the process docs in doc/testing.md
gem 'translation', '1.37' # translation.io - translation service
gem 'web-console' # In-browser debugger; use <% console %> or console
Expand Down
140 changes: 70 additions & 70 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,65 +1,66 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (8.0.1)
actionpack (= 8.0.1)
activesupport (= 8.0.1)
actioncable (7.2.2.1)
actionpack (= 7.2.2.1)
activesupport (= 7.2.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (8.0.1)
actionpack (= 8.0.1)
activejob (= 8.0.1)
activerecord (= 8.0.1)
activestorage (= 8.0.1)
activesupport (= 8.0.1)
actionmailbox (7.2.2.1)
actionpack (= 7.2.2.1)
activejob (= 7.2.2.1)
activerecord (= 7.2.2.1)
activestorage (= 7.2.2.1)
activesupport (= 7.2.2.1)
mail (>= 2.8.0)
actionmailer (8.0.1)
actionpack (= 8.0.1)
actionview (= 8.0.1)
activejob (= 8.0.1)
activesupport (= 8.0.1)
actionmailer (7.2.2.1)
actionpack (= 7.2.2.1)
actionview (= 7.2.2.1)
activejob (= 7.2.2.1)
activesupport (= 7.2.2.1)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (8.0.1)
actionview (= 8.0.1)
activesupport (= 8.0.1)
actionpack (7.2.2.1)
actionview (= 7.2.2.1)
activesupport (= 7.2.2.1)
nokogiri (>= 1.8.5)
rack (>= 2.2.4)
racc
rack (>= 2.2.4, < 3.2)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (8.0.1)
actionpack (= 8.0.1)
activerecord (= 8.0.1)
activestorage (= 8.0.1)
activesupport (= 8.0.1)
actiontext (7.2.2.1)
actionpack (= 7.2.2.1)
activerecord (= 7.2.2.1)
activestorage (= 7.2.2.1)
activesupport (= 7.2.2.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (8.0.1)
activesupport (= 8.0.1)
actionview (7.2.2.1)
activesupport (= 7.2.2.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (8.0.1)
activesupport (= 8.0.1)
activejob (7.2.2.1)
activesupport (= 7.2.2.1)
globalid (>= 0.3.6)
activemodel (8.0.1)
activesupport (= 8.0.1)
activerecord (8.0.1)
activemodel (= 8.0.1)
activesupport (= 8.0.1)
activemodel (7.2.2.1)
activesupport (= 7.2.2.1)
activerecord (7.2.2.1)
activemodel (= 7.2.2.1)
activesupport (= 7.2.2.1)
timeout (>= 0.4.0)
activestorage (8.0.1)
actionpack (= 8.0.1)
activejob (= 8.0.1)
activerecord (= 8.0.1)
activesupport (= 8.0.1)
activestorage (7.2.2.1)
actionpack (= 7.2.2.1)
activejob (= 7.2.2.1)
activerecord (= 7.2.2.1)
activesupport (= 7.2.2.1)
marcel (~> 1.0)
activesupport (8.0.1)
activesupport (7.2.2.1)
base64
benchmark (>= 0.3)
bigdecimal
Expand All @@ -71,7 +72,6 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ansi (1.5.0)
Expand Down Expand Up @@ -264,7 +264,7 @@ GEM
bigdecimal (~> 3.1)
net-http (0.6.0)
uri
net-imap (0.5.4)
net-imap (0.5.3)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -311,7 +311,7 @@ GEM
omniauth (~> 2.0)
pagy (6.5.0)
paleta (0.3.0)
paper_trail (16.0.0)
paper_trail (15.2.0)
activerecord (>= 6.1)
request_store (~> 1.4)
parallel (1.26.3)
Expand Down Expand Up @@ -376,20 +376,20 @@ GEM
rack-timeout (0.7.0)
rackup (2.2.1)
rack (>= 3)
rails (8.0.1)
actioncable (= 8.0.1)
actionmailbox (= 8.0.1)
actionmailer (= 8.0.1)
actionpack (= 8.0.1)
actiontext (= 8.0.1)
actionview (= 8.0.1)
activejob (= 8.0.1)
activemodel (= 8.0.1)
activerecord (= 8.0.1)
activestorage (= 8.0.1)
activesupport (= 8.0.1)
rails (7.2.2.1)
actioncable (= 7.2.2.1)
actionmailbox (= 7.2.2.1)
actionmailer (= 7.2.2.1)
actionpack (= 7.2.2.1)
actiontext (= 7.2.2.1)
actionview (= 7.2.2.1)
activejob (= 7.2.2.1)
activemodel (= 7.2.2.1)
activerecord (= 7.2.2.1)
activestorage (= 7.2.2.1)
activesupport (= 7.2.2.1)
bundler (>= 1.15.0)
railties (= 8.0.1)
railties (= 7.2.2.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -401,9 +401,9 @@ GEM
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rails-i18n (8.0.1)
rails-i18n (7.0.10)
i18n (>= 0.7, < 2)
railties (>= 8.0.0, < 9)
railties (>= 6.0.0, < 8)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
Expand All @@ -417,9 +417,9 @@ GEM
ruby-progressbar
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (8.0.1)
actionpack (= 8.0.1)
activesupport (= 8.0.1)
railties (7.2.2.1)
actionpack (= 7.2.2.1)
activesupport (= 7.2.2.1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
Expand Down Expand Up @@ -565,13 +565,13 @@ PLATFORMS
x86_64-linux-musl

DEPENDENCIES
actionmailer (~> 8.0.1)
actionpack (~> 8.0.1)
actionview (~> 8.0.1)
activejob (~> 8.0.1)
activemodel (~> 8.0.1)
activerecord (~> 8.0.1)
activesupport (~> 8.0.1)
actionmailer (~> 7.2.2)
actionpack (~> 7.2.2)
actionview (~> 7.2.2)
activejob (~> 7.2.2)
activemodel (~> 7.2.2)
activerecord (~> 7.2.2)
activesupport (~> 7.2.2)
attr_encrypted (~> 4)
awesome_print
bcrypt (~> 3.1.18)
Expand Down Expand Up @@ -607,7 +607,7 @@ DEPENDENCIES
omniauth-rails_csrf_protection
pagy (~> 6.0)
paleta (~> 0.3)
paper_trail (~> 16.0)
paper_trail (~> 15.2.0)
pg (~> 1.4)
pg_search (~> 2.3)
pronto (~> 0.11)
Expand All @@ -621,11 +621,11 @@ DEPENDENCIES
rack-cors (~> 2.0)
rack-headers_filter (~> 0.0.1)
rack-timeout (~> 0.7.0)
rails (~> 8.0.1)
rails (~> 7.2.2)
rails-controller-testing (~> 1.0)
rails-i18n (~> 8.0.1)
rails-i18n (~> 7.0.10)
rails_12factor (~> 0.0.3)
railties (~> 8.0.1)
railties (~> 7.2.2)
redcarpet (~> 3.5)
rubocop (~> 1.6)
rubocop-performance (~> 1.20)
Expand Down
8 changes: 3 additions & 5 deletions config/application.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ class Application < Rails::Application
end

# Prepare for future deprecation.
# to_time will always preserve the full timezone rather than the
# offset of the receiver in Rails 8.1.
# This opts into the new 8.1 behavior.
# In our case it doesn't matter, the only timezone we use is UTC.
# to_time will always preserve the timezone offset of the receiver in Rails 8.0.
# This opts into the new 8.0 behavior

ActiveSupport.to_time_preserves_timezone = :zone
ActiveSupport.to_time_preserves_timezone = true
8 changes: 0 additions & 8 deletions config/environment.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,5 @@
# Load the Rails application.
require_relative 'application'

# Eliminate deprecation warning that
# > `to_time` will always preserve the receiver timezone rather than
# > system local time in Rails 8.1. To opt in to the new behavior,
# > set `config.active_support.to_time_preserves_timezone = :zone`
# In practice we only use UTC in operational systems anyway.

Rails.configuration.active_support.to_time_preserves_timezone = :zone

# Initialize the Rails application.
Rails.application.initialize!

0 comments on commit 3842206

Please sign in to comment.