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

Jump to bottom

Pull in ActiveEncode patch version to fix google drive browse-everything case #5138

Merged
merged 1 commit into from
Mar 28, 2023
Merged

Pull in ActiveEncode patch version to fix google drive browse-everything case #5138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ gem 'omniauth-lti', git: "https://github.com/avalonmediasystem/omniauth-lti.git"
gem "omniauth-saml", "~> 2.0"

# Media Access & Transcoding
gem 'active_encode', '~> 1.0', '>= 1.1.2'
gem 'active_encode', '~> 1.0', '>= 1.1.3'
gem 'audio_waveform-ruby', '~> 1.0.7', require: 'audio_waveform'
gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'v1.2-avalon'
gem 'fastimage'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ GEM
active_elastic_job (3.2.0)
aws-sdk-sqs (~> 1)
rails (>= 5.2.6, < 7.1)
active_encode (1.1.2)
active_encode (1.1.3)
addressable (~> 2.8)
rails
active_fedora-datastreams (0.5.0)
Expand Down Expand Up @@ -993,7 +993,7 @@ DEPENDENCIES
active-fedora (~> 14.0, >= 14.0.1)
active_annotations (~> 0.4)
active_elastic_job
active_encode (~> 1.0, >= 1.1.2)
active_encode (~> 1.0, >= 1.1.3)
active_fedora-datastreams (~> 0.5)
activejob-traffic_control
activejob-uniqueness
Expand Down