Skip to content
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.

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

(test): Upgrade to Rails 7.2 #7559

Draft
wants to merge 21 commits into
base: master
Choose a base branch
from
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 .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ executors:
default: false

docker:
- image: cimg/ruby:3.1.4-browsers
- image: cimg/ruby:3.3.5-browsers
environment:
PG_HOST: localhost
PG_USER: ubuntu
Expand Down Expand Up @@ -221,7 +221,7 @@ commands:
steps:
- run:
name: Terminate Rails server
command: pkill -SIGTERM -f puma
command: pkill -SIGINT -f puma

- run:
name: Wait for Rails coverage results
Expand Down
27 changes: 15 additions & 12 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
# frozen_string_literal: true
source 'https://rubygems.org'

ruby '3.1.4'
ruby '3.3.5'

# These gems are included in Ruby defaults for now,
# but they will have to be included separately in future versions.
gem 'ostruct'
gem 'csv'

# For Windows devs
gem 'tzinfo-data', platforms: [:mswin, :mswin64]

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.0.8.4'
gem 'rails', '~> 7.2.1'

# Use PostgreSQL for the backend
gem 'pg'
Expand All @@ -18,7 +23,8 @@ gem 'rack-cors'
# Instance/Course settings
gem 'settings_on_rails', git: 'https://github.com/Coursemology/settings_on_rails'
# Manage read/unread status
gem 'unread'
# fix for https://github.com/ledermann/unread/issues/135
gem 'unread', git: 'https://github.com/ledermann/unread', ref: '675b744'
# Extension for validating hostnames and domain names
gem 'validates_hostname'
# A Ruby state machine library
Expand All @@ -29,14 +35,14 @@ gem 'activerecord-userstamp', git: 'https://github.com/Coursemology/activerecord
# Allow actions to be deferred until after a record is committed.
gem 'after_commit_action'
# Allow declaring the calculated attributes of a record
gem 'calculated_attributes', git: 'https://github.com/aha-app/calculated_attributes'
gem 'calculated_attributes', git: 'https://github.com/adi-herwana-nus/calculated_attributes.git'
# For multiple table inheritance
# TODO: Figure out breaking changes in v2 as polymorphism is not working correctly.
gem 'active_record-acts_as', git: 'https://github.com/Coursemology/active_record-acts_as.git'
# Organise ActiveRecord model into a tree structure
gem 'edge'
# Upsert action for Postgres
gem 'active_record_upsert', '0.11.2'
# Upsert action for Postgres with validations
gem 'active_record_upsert', git: 'https://github.com/jesjos/active_record_upsert', ref: 'c3e07ae'
# Create pretty URLs and work with human-friendly strings
gem 'friendly_id'

Expand Down Expand Up @@ -106,6 +112,8 @@ group :development, :test do
gem 'rubocop', '~> 1.66'

# Factory Bot for factories
# fix for https://github.com/thoughtbot/factory_bot/issues/1690
gem 'factory_bot', '~> 6.5.0'
gem 'factory_bot_rails'

# Checks that all translations are used and defined
Expand Down Expand Up @@ -180,13 +188,8 @@ gem 'jwt'
# Use cancancan for authorization
gem 'cancancan'

# Some helpers for structuring CSS/JavaScript
# Official version https://github.com/winston/rails_utils/pull/30 is no longer maintained.
# We also want stricter sanitization.
gem 'rails_utils', git: 'https://github.com/Coursemology/rails_utils.git'

# Using CarrierWave for file uploads
gem 'carrierwave', '2.2.6'
gem 'carrierwave', '~> 3'
# Generate sequential filenames
gem 'filename'
# Required by CarrierWave, for image resizing
Expand Down
Loading