Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rails / Hyrax Upgrade #39

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Rails / Hyrax Upgrade #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bc4af3
Rails / Hyrax Upgrade
orangewolf Oct 18, 2023
66a9405
🧹 Exclude specs and bin/rails from gem files
jeremyf Dec 19, 2023
4723b8f
🐛 Only render json for manifest requests
kirkkwang Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions app/controllers/concerns/hyrax/iiif_av/controller_behavior.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ def manifest

json = iiif_manifest_builder.manifest_for(presenter: iiif_manifest_presenter, iiif_manifest_factory: manifest_factory)

respond_to do |wants|
wants.json { render json: json }
wants.html { render json: json }
end
render json: json
end

private
Expand Down
6 changes: 3 additions & 3 deletions hyrax-iiif_av.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ Gem::Specification.new do |s|
s.license = 'Apache-2.0'

s.files = `git ls-files -z`.split("\x0").reject do |f|
f.match(%r{^(test|spec|features)/})
f.match(%r{^(test|spec|features)/}) || f == 'bin/rails'
end

s.add_dependency "rails", "~>5.1"
s.add_dependency "rails", ">= 5.1", "< 8.0"
s.add_dependency "blacklight"
s.add_dependency "hyrax", ">= 2.9", "< 4.0"
s.add_dependency "hyrax", ">= 3.5", "< 6.0"
s.add_dependency "iiif_manifest", "> 0.5"

s.add_development_dependency 'bixby'
Expand Down