Skip to content

Update Framework to Rails 7.1 #10

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.

Sign up for GitHub

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

Open
awilfox wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Framework to Rails 7.1 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
470 changes: 243 additions & 227 deletions .idea/altmedia.iml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN apt-get install -y --no-install-recommends \
git \
gpg \
libpq-dev \
libvips42
libyaml-dev

# Install Node.js and Yarn from their own repositories

Expand Down Expand Up @@ -108,7 +108,7 @@ RUN apt-get install -y --no-install-recommends \
USER $APP_USER

# Base image ships with an older version of bundler
RUN gem install bundler --version 2.5.22
RUN gem install bundler --version 2.7.2

# Install gems. We don't enforce the validity of the Gemfile.lock until the
# final (production) stage.
Expand Down
20 changes: 9 additions & 11 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@ gem 'berkeley_library-tind', '~> 0.8.0'
gem 'berkeley_library-util', '~> 0.2.0'
gem 'bootstrap'
gem 'dotenv-rails', '~> 2.8.1', require: 'dotenv/rails-now'
gem 'drb'
gem 'faraday'
gem 'good_job', '~> 3.10', '>= 3.14.2'
gem 'good_job', '~> 3.25', '< 3.99.0'
gem 'ipaddress'
gem 'jaro_winkler', '~> 1.5.5'
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'jwt', '~> 1.5', '>= 1.5.4'
gem 'lograge', '>=0.11.2'
gem 'mutex_m'
gem 'netaddr', '~> 1.5', '>= 1.5.1'
gem 'net-ssh'
gem 'okcomputer', '~> 1.19'
Expand All @@ -31,21 +29,21 @@ gem 'omniauth-cas', '~> 2.0'
gem 'pg', '~> 1.2'
gem 'prawn', '~> 2.4'
gem 'puma', '~> 4.3', '>= 4.3.12'
gem 'rails', '~> 7.0.4'
gem 'rails', '~> 7.1.6'
gem 'recaptcha', '~> 4.13'
gem 'sprockets', '~> 4.0'
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
gem 'tzinfo-data', platforms: %i[windows jruby]

group :development, :test do
gem 'brakeman'
gem 'bundle-audit'
gem 'byebug', platforms: %i[mri mingw x64_mingw]
gem 'byebug', platforms: %i[mri windows]
gem 'colorize'
gem 'database_cleaner-active_record', '~> 2.0'
gem 'database_cleaner-active_record', '~> 2.1'
gem 'roo', '~> 2.8'
gem 'rspec', '~> 3.10'
gem 'rspec', '~> 3.13'
gem 'rspec_junit_formatter', '~> 0.5'
gem 'rspec-rails', '~> 5.0'
gem 'rspec-rails', '~> 6.1'
gem 'ruby-prof', '~> 1.3.0'
gem 'webmock'
end
Expand All @@ -65,6 +63,6 @@ group :test do
gem 'capybara', '~> 3.36'
gem 'concurrent-ruby', '~> 1.1'
gem 'selenium-webdriver', '~> 4.0'
gem 'simplecov', '~> 0.21', require: false
gem 'simplecov-rcov', '~> 0.2', require: false
gem 'simplecov', '~> 0.22', require: false
gem 'simplecov-rcov', '~> 0.3.7', require: false
end
Loading