Skip to content

Commit

Permalink
Merge branch 'new-player'
Browse files Browse the repository at this point in the history
  • Loading branch information
michelson committed May 15, 2024
2 parents 8e09000 + 8ca50c4 commit e41a300
Show file tree
Hide file tree
Showing 101 changed files with 2,007 additions and 497 deletions.
12 changes: 7 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby "3.2.2"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 7.0.7"
gem "rails", "~> 7.1.3.2"

# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem "sprockets-rails"
Expand All @@ -13,12 +13,13 @@ gem "sprockets-rails"
gem "pg", "~> 1.1"

# Use the Puma web server [https://github.com/puma/puma]
gem "puma", "~> 5.0"
gem "puma"
# gem "falcon"

# Bundle and transpile JavaScript [https://github.com/rails/jsbundling-rails]
gem "jsbundling-rails"

gem "hotwire_combobox"
gem "hotwire_combobox", github: "josefarias/hotwire_combobox", branch: "main"

# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
gem "turbo-rails", github: "hotwired/turbo-rails", branch: "main"
Expand Down Expand Up @@ -66,7 +67,8 @@ gem "image_processing", "~> 1.2"
gem "acts_as_list", "~> 0.9.19"
gem "rails_heroicon"
gem "aasm", "~> 5.2"
gem "acts-as-taggable-on", "~> 9.0"
gem "acts-as-taggable-on", github: "mbleigh/acts-as-taggable-on" # branch: "support_rails_7-1"

gem "aws-sdk-rails"
gem "aws-sdk-s3", "~> 1.48"
gem "friendly_id", "~> 5.4"
Expand Down Expand Up @@ -144,7 +146,7 @@ gem "transbank-sdk", "~> 3.0"
gem "stripe", "~> 8.6"
gem "mercadopago", "~> 2.3"

gem "meta-tags", "~> 2.18"
gem "meta-tags", github: "kpumuk/meta-tags", branch: :main

gem "http", "~> 5.1"

Expand Down
Loading

0 comments on commit e41a300

Please sign in to comment.