Skip to content

Commit

Permalink
Rails 7.2 and updated vite (#1938)
Browse files Browse the repository at this point in the history
  • Loading branch information
carolyncole authored Sep 20, 2024
1 parent 2ba1d0b commit 54ea851
Show file tree
Hide file tree
Showing 16 changed files with 1,425 additions and 497 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
working_directory: ~/pdc_describe
docker:
- &ruby_docker
image: cimg/ruby:3.1.0-browsers
image: cimg/ruby:3.1.6-browsers
environment:
RAILS_ENV: test
steps:
Expand All @@ -62,7 +62,7 @@ jobs:
# We don't actually need any of the ruby environment to lint JS... but use what we have for now.
working_directory: ~/pdc_describe
docker:
- image: cimg/ruby:3.1.0-browsers
- image: cimg/ruby:3.1.6-browsers
environment:
RAILS_ENV: test
steps:
Expand Down
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ gem "net-imap"
gem "net-pop"
gem "net-ssh", "7.0.0.beta1"
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
gem "rails", "~> 6.1.7"
gem "rails"
# Use sqlite3 as the database for Active Record
gem "pg"
# Use Puma as the app server
gem "puma", "~> 5.6"
# Use SCSS for stylesheets
gem "sass-rails", ">= 6"
gem "sass-rails"
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem "turbolinks", "~> 5"
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
Expand All @@ -33,9 +33,9 @@ gem "redis", "~> 4.0"
gem "nokogiri", ">= 1.13.4"
gem "retryable"
gem "rolify"
gem "rspec-rails", "~> 5.0.0"
gem "rspec-rails"
gem "sidekiq", "~> 7.2"
gem "vite_rails", "3.0.12"
gem "vite_rails"
gem "whenever"

# Reference: https://github.com/pulibrary/pul-the-hard-way/blob/main/services/cas.md
Expand Down
Loading

0 comments on commit 54ea851

Please sign in to comment.