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.

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

Relax sprockets rails #735

Merged
merged 2 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ eval File.read(gems), binding, gems # rubocop: disable Security/Eval
require "#{__dir__}/lib/bootstrap_form/version"

gem "rails", BootstrapForm::REQUIRED_RAILS_VERSION
gem "sprockets-rails", "< 3.5.0", require: "sprockets/railtie"
gem "sprockets-rails", require: "sprockets/railtie"

gem "bigdecimal" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
gem "drb" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
Expand Down
2 changes: 1 addition & 1 deletion demo/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gem "htmlbeautifier"
gem "jbuilder"
gem "jsbundling-rails"
gem "puma"
gem "sprockets-rails", "< 3.5.0", require: "sprockets/railtie"
gem "sprockets-rails", require: "sprockets/railtie"
gem "sqlite3", "~> 1.4"
gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]

Expand Down
14 changes: 7 additions & 7 deletions demo/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ GEM
capybara (>= 2, < 4)
chunky_png (~> 1.3)
chunky_png (1.4.0)
concurrent-ruby (1.3.1)
concurrent-ruby (1.3.3)
connection_pool (2.4.1)
crass (1.0.6)
cssbundling-rails (1.4.0)
Expand Down Expand Up @@ -214,8 +214,8 @@ GEM
regexp_parser (2.9.2)
reline (0.5.8)
io-console (~> 0.5)
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.2.9)
strscan
rubyzip (2.3.2)
selenium-webdriver (4.21.1)
base64 (~> 0.2)
Expand All @@ -225,9 +225,9 @@ GEM
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets-rails (3.5.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
sqlite3 (1.7.3-aarch64-linux)
sqlite3 (1.7.3-arm-linux)
Expand Down Expand Up @@ -275,7 +275,7 @@ DEPENDENCIES
puma
rails (~> 7.1.1)
selenium-webdriver
sprockets-rails (< 3.5.0)
sprockets-rails
sqlite3 (~> 1.4)
tzinfo-data
web-console
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ gem "drb" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
gem "mutex_m" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
gem "rails", "~> 7.1.0"
gem "sqlite3", "~> 1.4"
gem "sprockets-rails", "< 3.5.0", require: "sprockets/railtie"
gem "sprockets-rails", require: "sprockets/railtie"
2 changes: 1 addition & 1 deletion gemfiles/edge.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ gem "drb" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
gem "mutex_m" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
gem "sqlite3"
gem "sprockets-rails", "< 3.5.0", require: "sprockets/railtie"
gem "sprockets-rails", require: "sprockets/railtie"
Loading