Skip to content

Commit

Permalink
Merge pull request #5761 from avalonmediasystem/7.7.1.rc1
Browse files Browse the repository at this point in the history
Use released version of iiif_manifest
  • Loading branch information
cjcolvar authored Apr 1, 2024
2 parents 3f1b1af + f7c6947 commit 0b50bd9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git'
#gem 'bootstrap-sass', '< 3.4.1' # Pin to less than 3.4.1 due to change in behavior with popovers
gem 'bootstrap-toggle-rails'
gem 'bootstrap_form'
gem 'iiif_manifest', git: 'https://github.com/samvera/iiif_manifest.git', branch: 'canvas-homepage'
gem 'iiif_manifest', '~> 1.5'
gem 'rack-cors', require: 'rack/cors'
gem 'rails_same_site_cookie'
gem 'recaptcha', require: 'recaptcha/rails'
Expand Down
12 changes: 3 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,6 @@ GIT
ims-lti
omniauth

GIT
remote: https://github.com/samvera/iiif_manifest.git
revision: e7aea3ab9614f645ccdb760f78954a7ef2cd893c
branch: canvas-homepage
specs:
iiif_manifest (1.4.0)
activesupport (>= 4)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -502,6 +494,8 @@ GEM
i18n (1.14.4)
concurrent-ruby (~> 1.0)
iconv (1.0.8)
iiif_manifest (1.5.0)
activesupport (>= 4)
ims-lti (1.1.13)
builder
oauth (>= 0.4.5, < 0.6)
Expand Down Expand Up @@ -1043,7 +1037,7 @@ DEPENDENCIES
httpx
hydra-head (~> 12.0)
iconv (~> 1.0.6)
iiif_manifest!
iiif_manifest (~> 1.5)
ims-lti (~> 1.1.13)
jbuilder (~> 2.0)
jquery-datatables
Expand Down

0 comments on commit 0b50bd9

Please sign in to comment.