From ecf0d53f0a2d0625d3a0c570350ad0c8e0afef25 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Thu, 21 Aug 2025 03:23:57 +0500 Subject: [PATCH 1/4] Revert "revert "Bump rexml from 3.2.9 to 3.3.9"" This reverts commit c821b0a28529468020a5d8d299c376f116d94a0f. --- Gemfile.lock | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c684f6982a..a716c4383b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,12 +112,12 @@ GEM activejob (7.1.6) activesupport (= 7.1.6) globalid (>= 0.3.6) - activemerchant (1.133.0) + activemerchant (1.137.0) activesupport (>= 4.2) builder (>= 2.1.2, < 4.0.0) i18n (>= 0.6.9) nokogiri (~> 1.4) - rexml (~> 3.2.5) + rexml (~> 3.3, >= 3.3.4) activemodel (7.1.6) activesupport (= 7.1.6) activerecord (7.1.6) @@ -692,8 +692,7 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.2.9) - strscan + rexml (3.3.9) roadie (5.2.1) css_parser (~> 1.4) nokogiri (~> 1.15) @@ -858,7 +857,6 @@ GEM stringex (2.8.6) stringio (3.1.7) stripe (13.5.1) - strscan (3.1.5) swd (2.0.3) activesupport (>= 3) attr_required (>= 0.0.5) From a82209af85976c20958302c2d1f704e22c1752c5 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Thu, 21 Aug 2025 03:31:38 +0500 Subject: [PATCH 2/4] Update activemerchant version constraint to '~> 1.137.0' in Gemfile and Gemfile.lock --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 327478e9e8..7c1d9a01de 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem "active_storage_validations" gem "aws-sdk-s3", require: false gem "image_processing" -gem 'activemerchant', '>= 1.78.0' +gem 'activemerchant', '~> 1.137.0' gem 'angular-rails-templates', '>= 0.3.0' gem 'ransack', '~> 4.1.0' gem 'responders' diff --git a/Gemfile.lock b/Gemfile.lock index a716c4383b..d71124a3a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -955,7 +955,7 @@ DEPENDENCIES actionpack-action_caching active_model_serializers (= 0.8.4) active_storage_validations - activemerchant (>= 1.78.0) + activemerchant (~> 1.137.0) activerecord-import activerecord-postgresql-adapter activerecord-session_store From 6eb6bf634f75f8c1ed9909c4aa029d87422624c7 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Wed, 27 Aug 2025 03:35:34 +0500 Subject: [PATCH 3/4] Update activemerchant version constraint to '>= 1.137.0' in Gemfile and Gemfile.lock --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 7c1d9a01de..1b918c1f1f 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem "active_storage_validations" gem "aws-sdk-s3", require: false gem "image_processing" -gem 'activemerchant', '~> 1.137.0' +gem 'activemerchant', '>= 1.137.0' gem 'angular-rails-templates', '>= 0.3.0' gem 'ransack', '~> 4.1.0' gem 'responders' diff --git a/Gemfile.lock b/Gemfile.lock index d71124a3a1..f54d8cd63f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -955,7 +955,7 @@ DEPENDENCIES actionpack-action_caching active_model_serializers (= 0.8.4) active_storage_validations - activemerchant (~> 1.137.0) + activemerchant (>= 1.137.0) activerecord-import activerecord-postgresql-adapter activerecord-session_store From ae70a1372b5734b3c3eb9a77769fe87bdecd763f Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Thu, 30 Oct 2025 03:33:05 +0500 Subject: [PATCH 4/4] Remove version constraints for activemerchant and angular-rails-templates in Gemfile --- Gemfile | 4 ++-- Gemfile.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 1b918c1f1f..fd3824b450 100644 --- a/Gemfile +++ b/Gemfile @@ -14,8 +14,8 @@ gem "active_storage_validations" gem "aws-sdk-s3", require: false gem "image_processing" -gem 'activemerchant', '>= 1.137.0' -gem 'angular-rails-templates', '>= 0.3.0' +gem 'activemerchant' +gem 'angular-rails-templates' gem 'ransack', '~> 4.1.0' gem 'responders' gem 'webpacker', '~> 5' diff --git a/Gemfile.lock b/Gemfile.lock index f54d8cd63f..91cfae73df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -955,13 +955,13 @@ DEPENDENCIES actionpack-action_caching active_model_serializers (= 0.8.4) active_storage_validations - activemerchant (>= 1.137.0) + activemerchant activerecord-import activerecord-postgresql-adapter activerecord-session_store acts-as-taggable-on acts_as_list (= 1.0.4) - angular-rails-templates (>= 0.3.0) + angular-rails-templates angular_rails_csrf angularjs-file-upload-rails (~> 2.4.1) angularjs-rails (= 1.8.0)