Skip to content

Commit

Permalink
🧹 Switch to Hyrax double_combo branch
Browse files Browse the repository at this point in the history
We are using this branch on Hyrax because it has quite a few Valkyrie
related fixes in it.
  • Loading branch information
kirkkwang committed Dec 12, 2023
1 parent 0840f98 commit 68f8909
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ gem 'factory_bot_rails', group: %i[test]
gem 'fcrepo_wrapper', '~> 0.4', group: %i[development test]
gem 'flutie'
gem 'googleauth', '= 1.8.1' # 1.9.0 got yanked from rubygems, hard pinning until we can upgrade
gem 'hyrax', github: 'samvera/hyrax', tag: 'hyrax-v5.0.0.rc2'
gem 'hyrax', github: 'samvera/hyrax', branch: 'double_combo'
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]
Expand Down
6 changes: 2 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ GIT

GIT
remote: https://github.com/samvera/hyrax.git
revision: 3dd81340fc2586132772fa4017946ed4c60adb8a
tag: hyrax-v5.0.0.rc2
revision: 9ef64090a13abdeaabfaabdee851829093d02cc4
branch: double_combo
specs:
hyrax (5.0.0.rc2)
active-fedora (~> 14.0)
Expand All @@ -59,7 +59,6 @@ GIT
dry-events (~> 1.0, >= 1.0.1)
dry-logic (~> 1.5)
dry-monads (~> 1.6)
dry-struct (~> 1.6)
dry-validation (~> 1.10)
flipflop (~> 2.3)
flot-rails (~> 0.0.6)
Expand Down Expand Up @@ -1366,7 +1365,6 @@ DEPENDENCIES
iiif_print!
jbuilder (~> 2.5)
jquery-rails
json-canonicalization (= 0.3.1)
launchy
listen (>= 3.0.5, < 3.2)
lograge
Expand Down

0 comments on commit 68f8909

Please sign in to comment.