diff --git a/Gemfile b/Gemfile index 327478e9e8..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.78.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 c684f6982a..91cfae73df 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) @@ -957,13 +955,13 @@ DEPENDENCIES actionpack-action_caching active_model_serializers (= 0.8.4) active_storage_validations - activemerchant (>= 1.78.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)