From e1761fe0ba8a291772bfd349b0b132545c4b6aa4 Mon Sep 17 00:00:00 2001 From: Chris Colvard Date: Mon, 30 Sep 2024 17:42:01 -0400 Subject: [PATCH] Use released version of ActiveFedora --- Gemfile | 7 +++---- spec/test_app_templates/Gemfile.extra | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index baa5fc54..eb1abd97 100644 --- a/Gemfile +++ b/Gemfile @@ -51,10 +51,9 @@ if !ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'] =~ /^5/ gem 'psych', '< 4' end -gem 'active-fedora', git: "https://github.com/samvera/active_fedora.git", branch: "further_along_the_rails" -#if ENV['ACTIVE_FEDORA_VERSION'] -# gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION'] -#end +if ENV['ACTIVE_FEDORA_VERSION'] + gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION'] +end if ENV['BLACKLIGHT_VERSION'] gem 'blacklight', ENV['BLACKLIGHT_VERSION'] diff --git a/spec/test_app_templates/Gemfile.extra b/spec/test_app_templates/Gemfile.extra index ff63c16e..e8888cb7 100644 --- a/spec/test_app_templates/Gemfile.extra +++ b/spec/test_app_templates/Gemfile.extra @@ -1,9 +1,8 @@ gem 'byebug' unless ENV['CI'] -gem 'active-fedora', git: "https://github.com/samvera/active_fedora.git", branch: "further_along_the_rails" -#if ENV['ACTIVE_FEDORA_VERSION'] -# gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION'] -#end +if ENV['ACTIVE_FEDORA_VERSION'] + gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION'] +end if !ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'] =~ /^6.0/ || ENV['RAILS_VERSION'] =~ /^5/ gem 'psych', '< 4'