From 58c628e0707e3dc9b6595bca7da126d203d5e3aa Mon Sep 17 00:00:00 2001 From: adi-herwana-nus Date: Sun, 19 Jul 2026 03:55:04 +0800 Subject: [PATCH 1/2] chore(deps): partial dependency upgrade for rails 8.x compatibility - re-pinned "active_record_upsert", "calculated_attributes", "unread" - removed dead "kaminari" gem --- Gemfile | 12 +++++++----- Gemfile.lock | 48 +++++++++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/Gemfile b/Gemfile index f746a8efb0..c04d9a4cf9 100644 --- a/Gemfile +++ b/Gemfile @@ -23,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', '~> 0.14.0' +# Pinned past v0.14.0 (last RubyGems release, Oct 2024) for Rails 8.0/8.1 support; still supports 7.2. +gem 'unread', git: 'https://github.com/ledermann/unread.git', ref: '9114324' # Extension for validating hostnames and domain names gem 'validates_hostname' # A Ruby state machine library @@ -34,14 +35,17 @@ 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/Coursemology/calculated_attributes.git' +# Upstream v1.1.1 (supports Rails 7.0/7.1/7.2/8.0); retires the Coursemology fork. +# TODO: bump to upstream master (v1.2.0) for Rails 8.1 during that upgrade — v1.1.1 ships no 8.1 patch. +gem 'calculated_attributes', git: 'https://github.com/aha-app/calculated_attributes.git', ref: 'ecaf6c9' # 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 with validations -gem 'active_record_upsert', git: 'https://github.com/jesjos/active_record_upsert', ref: 'c3e07ae' +# Pinned to v0.13.0 (adds Rails 8.1 support); not yet published to RubyGems. Supports AR 7.2–8.1. +gem 'active_record_upsert', git: 'https://github.com/jesjos/active_record_upsert', ref: 'cb6f2a2' # Create pretty URLs and work with human-friendly strings gem 'friendly_id' @@ -61,8 +65,6 @@ gem 'globalid' gem 'jbuilder' # Slim as the templating language gem 'slim-rails' -# Paginator for Rails -gem 'kaminari' # Work with Docker gem 'docker-api' diff --git a/Gemfile.lock b/Gemfile.lock index 30f8cf8794..775d6eac4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,13 +13,6 @@ GIT activerecord-userstamp (3.0.5) rails (>= 6) -GIT - remote: https://github.com/Coursemology/calculated_attributes.git - revision: 3d9fe0c99070c61de634b7235044200d61b65a65 - specs: - calculated_attributes (1.0.1) - activerecord (>= 6.0.0, < 8) - GIT remote: https://github.com/Coursemology/polyglot revision: 0cbe1260d30a6eb361930f811d92107775edeed3 @@ -40,15 +33,31 @@ GIT settings_on_rails (0.4.0) rails (>= 6) +GIT + remote: https://github.com/aha-app/calculated_attributes.git + revision: ecaf6c95c8d097e58e2660e84e131df4aed16600 + ref: ecaf6c9 + specs: + calculated_attributes (1.1.1) + activerecord (>= 7.0.0, < 9) + GIT remote: https://github.com/jesjos/active_record_upsert - revision: c3e07aecf28d6a81a06fcada4710b103dfca823b - ref: c3e07ae + revision: cb6f2a2a395f96299a035116cfb10101cd85e2b6 + ref: cb6f2a2 specs: - active_record_upsert (0.11.2) - activerecord (>= 5.2, < 8.0) + active_record_upsert (0.13.0) + activerecord (>= 5.2, < 8.2) pg (>= 0.18, < 2.0) +GIT + remote: https://github.com/ledermann/unread.git + revision: 91143245a34342b5e8cecb5ce1359c13c52ee9a7 + ref: 9114324 + specs: + unread (0.14.0) + activerecord (>= 7.2) + GEM remote: https://rubygems.org/ specs: @@ -339,18 +348,6 @@ GEM bigdecimal (~> 3.1) jwt (2.10.3) base64 - kaminari (1.2.2) - activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.2) - kaminari-activerecord (= 1.2.2) - kaminari-core (= 1.2.2) - kaminari-actionview (1.2.2) - actionview - kaminari-core (= 1.2.2) - kaminari-activerecord (1.2.2) - activerecord - kaminari-core (= 1.2.2) - kaminari-core (1.2.2) keycloak (3.3.0) json (~> 2.6) jwt (~> 2.4) @@ -678,8 +675,6 @@ GEM unicode-emoji (~> 4.1) unicode-emoji (4.2.0) uniform_notifier (1.18.0) - unread (0.14.0) - activerecord (>= 6.1) uri (1.1.1) useragent (0.16.11) validates_hostname (1.0.13) @@ -747,7 +742,6 @@ DEPENDENCIES image_optim_rails jbuilder jwt (~> 2.10.3) - kaminari keycloak langchainrb listen @@ -800,7 +794,7 @@ DEPENDENCIES stackprof traceroute tzinfo-data - unread (~> 0.14.0) + unread! validates_hostname workflow workflow-activerecord (>= 4.1, < 7.0) From 345bad903264a752ffc87b5306d674c402006c58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2026 22:11:44 +0000 Subject: [PATCH 2/2] chore(deps): bump websocket-driver from 0.7.4 to 0.7.5 in /client Bumps [websocket-driver](https://github.com/faye/websocket-driver-node) from 0.7.4 to 0.7.5. - [Changelog](https://github.com/faye/websocket-driver-node/blob/main/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-driver-node/compare/0.7.4...0.7.5) --- updated-dependencies: - dependency-name: websocket-driver dependency-version: 0.7.5 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- client/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/yarn.lock b/client/yarn.lock index 64bd765e10..fd03c1eb8c 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -14107,9 +14107,9 @@ webpack@^5.106.2: webpack-sources "^3.3.4" websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== + version "0.7.5" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.5.tgz#569d22764ab21f2de20af0e74b411e8ae5a0fa46" + integrity sha512-ZL2+3c7kMBdIRCMz6l8jQMHyGVxj+UL+xVk74Ombiciboca8rHa15L86B19E5oh1pL9Ii/uj54gtsIrZGMo6zA== dependencies: http-parser-js ">=0.5.1" safe-buffer ">=5.1.0"