diff --git a/Gemfile b/Gemfile index 8894132b6..820e33d9d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" } -gem "rails", github: "rails/rails", branch: "main" +gem "rails", github: "flavorjones/rails", branch: "flavorjones/fix-script-name-in-root-mounted-engine" # Assets & front end gem "importmap-rails" diff --git a/Gemfile.lock b/Gemfile.lock index b7ad6b1d4..e84496eef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,17 +89,9 @@ GIT zeitwerk (~> 2) GIT - remote: https://github.com/jeremy/mysql2.git - revision: b5766f5d296745d6aed014c8c0b7d82ef149ade1 - ref: b5766f5d296745d6aed014c8c0b7d82ef149ade1 - branch: force_latin1_to_utf8 - specs: - mysql2 (0.5.4.latin1utf8) - -GIT - remote: https://github.com/rails/rails.git - revision: 604e8e057020d3ae522f674e3fdcaf4dea160d31 - branch: main + remote: https://github.com/flavorjones/rails.git + revision: b780f4ea6eaf854e73d24d0d83867e887d7aeadd + branch: flavorjones/fix-script-name-in-root-mounted-engine specs: actioncable (8.1.0.beta1) actionpack (= 8.1.0.beta1) @@ -197,6 +189,14 @@ GIT tsort (>= 0.2) zeitwerk (~> 2.6) +GIT + remote: https://github.com/jeremy/mysql2.git + revision: b5766f5d296745d6aed014c8c0b7d82ef149ade1 + ref: b5766f5d296745d6aed014c8c0b7d82ef149ade1 + branch: force_latin1_to_utf8 + specs: + mysql2 (0.5.4.latin1utf8) + PATH remote: gems/fizzy-saas specs: