Skip to content

Commit

Permalink
Merge pull request #6017 from avalonmediasystem/rails_7-2
Browse files Browse the repository at this point in the history
Upgrade to Rails 7.2
  • Loading branch information
masaball authored Sep 4, 2024
2 parents 2011b2a + bb6046f commit b9c119f
Show file tree
Hide file tree
Showing 33 changed files with 1,117 additions and 518 deletions.
16 changes: 8 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ gem 'bootsnap', require: false
gem 'listen'
gem 'net-smtp', require: false
gem 'psych', '< 4'
gem 'rails', '~>7.0.8'
gem 'rails', '~>7.2'
gem 'sprockets', '~>3.7.2'
#gem 'sprockets-rails', require: 'sprockets/railtie'
gem 'sqlite3'
# Force newer version of mail for compatibility with rails 6.0.6.1
gem 'mail', '> 2.8.0.1'

# Assets
gem 'bootstrap', '~> 4.0'
gem 'bootstrap', '4.6.2'
gem 'coffee-rails', '~> 5.0'
gem "font-awesome-rails"
gem 'jquery-datatables'
Expand All @@ -29,11 +29,11 @@ gem 'terser'
gem 'shakapacker'

# Core Samvera
gem 'active-fedora', '~> 14.0', '>= 14.0.1'
gem 'active-fedora', git: 'https://github.com/samvera/active_fedora.git', branch: 'further_along_the_rails'
gem 'active_fedora-datastreams', '~> 0.5'
gem 'hydra-head', '~> 12.0'
gem 'hydra-head', git: 'https://github.com/samvera/hydra-head.git', branch: 'af_version'
gem 'ldp', '~> 1.1.0'
gem 'noid-rails', '~> 3.1'
gem 'noid-rails', git: 'https://github.com/samvera/noid-rails.git', branch: 'main'
gem 'om', git: 'https://github.com/avalonmediasystem/om.git', tag: 'v3.2.0-ruby3'
gem 'rdf-rdfxml'

Expand All @@ -45,7 +45,7 @@ gem 'rsolr', '~> 2.0'

# Rails & Samvera Plugins
gem 'about_page', git: 'https://github.com/avalonmediasystem/about_page.git', tag: 'avalon-r6.5'
gem 'active_annotations', '~> 0.4'
gem 'active_annotations', git: 'https://github.com/avalonmediasystem/active_annotations.git', branch: 'rails_upgrade'
gem 'activerecord-session_store', '>= 2.0.0'
gem 'acts_as_list'
gem 'api-pagination'
Expand All @@ -57,7 +57,7 @@ gem 'iiif_manifest', '~> 1.6'
gem 'rack-cors', require: 'rack/cors'
gem 'rails_same_site_cookie'
gem 'recaptcha', require: 'recaptcha/rails'
gem 'samvera-persona', '~> 0.4', '>= 0.4.1'
gem 'samvera-persona', git: 'https://github.com/samvera-labs/samvera-persona.git', branch: 'rails_7-2'
gem 'speedy-af', '~> 0.3'

# Avalon Components
Expand All @@ -76,7 +76,7 @@ gem "omniauth-saml", "~> 2.0"
# Media Access & Transcoding
gem 'active_encode', '>= 1.2.2'
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 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'v1.4-avalon'
gem 'fastimage'
gem 'rest-client', '~> 2.0'
gem 'roo'
Expand Down
Loading

0 comments on commit b9c119f

Please sign in to comment.