From 38a32e82b82f11d6685963c437c9273c39c91a4f Mon Sep 17 00:00:00 2001 From: LaRita Robinson Date: Fri, 15 Nov 2024 14:53:55 -0500 Subject: [PATCH] Revert to using Hyrax main branch --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b6ca58b1d..68f8f7f6b 100644 --- a/Gemfile +++ b/Gemfile @@ -53,7 +53,7 @@ gem 'good_job', '~> 2.99' gem 'googleauth', '~> 1.9.0' gem 'google-protobuf', force_ruby_platform: true # required because google-protobuf is not compatible with Alpine linux gem 'grpc', force_ruby_platform: true # required because google-protobuf is not compatible with Alpine linux -gem 'hyrax', github: 'samvera/hyrax', branch: 'send-string-ids-to-job' +gem 'hyrax', github: 'samvera/hyrax', branch: 'main' gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'rails_hyrax_upgrade' gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'rails_hyrax_upgrade' gem 'i18n-debug', require: false, group: %i[development test] diff --git a/Gemfile.lock b/Gemfile.lock index b14b462d4..03ff39836 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -120,8 +120,8 @@ GIT GIT remote: https://github.com/samvera/hyrax.git - revision: e56340c729064b95611452211e3235a5eb5f85b1 - branch: send-string-ids-to-job + revision: abd5955f325b966ebd21d0de8d96b61cf0421cf3 + branch: main specs: hyrax (5.0.1) active-fedora (~> 14.0)