Skip to content
Open
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
2 changes: 1 addition & 1 deletion .cloud66/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rails:
configuration:
ruby_version: 3.4.3
ruby_version: 4.0.6
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Installs Ruby 3.4. When human-essentials moves to a newer version of ruby,
# Installs Ruby 4.0. When human-essentials moves to a newer version of ruby,
# it will be more efficient to change the image.
# See https://github.com/devcontainers/images/blob/main/src/ruby/history/
#
# See devcontainers/features#1431 for why we include the `-bookworm`
# suffix. Once that issue is resolved, we can remove the suffix, which
# will let us follow the debian upgrade to trixie.
FROM mcr.microsoft.com/devcontainers/ruby:dev-3.4-bookworm
FROM mcr.microsoft.com/devcontainers/ruby:dev-4.0-bookworm
RUN export DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y install vim curl gpg postgresql postgresql-contrib
# Headless browser for Cuprite/Capybara system specs. Google Chrome only ships
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/post-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rbenv init zsh &
# gem install nokogiri -v 1.18.1 --platform=ruby -- --use-system-libraries

# If the project's required ruby version (specified in .ruby-version)
# changes from 3.4.3, this command will download and compile the correct
# changes from 4.0.6, this command will download and compile the correct
# version, but it will take a long time.
echo "*** Installing rbenv-able Ruby ***"
rbenv install --skip-existing &
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.3
4.0.6
8 changes: 8 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ gem "sprockets", "~> 4.2.2"
gem "prawn", "~> 2.4.0"
gem "matrix" # Used by prawn
gem "ttfunk", "~>1.7.0"
# `benchmark` was removed from Ruby's default gems in Ruby 4.0. delayed_job
# requires it at load time but does not declare it as a dependency, so we pin
# it here to keep the app loadable under Ruby 4.0.
gem "benchmark"

group :production, :staging do
# Reduce the noise of logs and include custom fields to it for easier access
Expand Down Expand Up @@ -146,6 +150,10 @@ group :development, :test do
gem "pry-rails"
# Connect to a remotely running command line instance.
gem "pry-remote"
# `readline` was removed from Ruby's default gems in Ruby 4.0. pry-remote
# requires it without declaring it as a dependency, so we pin it in the
# dev/test group to keep the app loadable under Ruby 4.0.
gem "readline"
# Add-on for command line to create a simple debugger.
gem "pry-nav"
# Debugger which supports rdbg and Shopify Ruby LSP VSCode extension
Expand Down
7 changes: 6 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ GEM
nokogiri (~> 1, >= 1.10.8)
base64 (0.3.0)
bcrypt (3.1.22)
benchmark (0.5.0)
better_errors (2.10.1)
erubi (>= 1.0.0)
rack (>= 0.9.0)
Expand Down Expand Up @@ -271,7 +272,7 @@ GEM
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday-retry (1.0.4)
faraday_middleware (1.2.0)
faraday (~> 1.0)
ferrum (0.17.1)
Expand Down Expand Up @@ -597,6 +598,8 @@ GEM
erb
psych (>= 4.0.0)
tsort
readline (0.0.4)
reline
recaptcha (5.21.2)
regexp_parser (2.12.0)
reline (0.6.3)
Expand Down Expand Up @@ -779,6 +782,7 @@ DEPENDENCIES
awesome_print
aws-sdk-s3
azure-storage-blob
benchmark
better_errors
binding_of_caller
bootsnap
Expand Down Expand Up @@ -844,6 +848,7 @@ DEPENDENCIES
rails (~> 8.1.0)
rails-controller-testing
rails-erd
readline
recaptcha
rolify (~> 6.0)
rspec-rails (~> 8.0.2)
Expand Down
Loading