From 96ca8b7e7c6aa7e6a94c1ea41a29d5374232671f Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Fri, 2 Aug 2024 20:41:52 -0400 Subject: [PATCH] Install propshaft from main (#25) Reviewed-on: https://git.atomaka.com/atomaka/budget/pulls/25 --- Gemfile | 2 +- Gemfile.lock | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 53cca0c..84f9cd1 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "rails", github: "rails/rails", branch: "main" # The modern asset pipeline for Rails [https://github.com/rails/propshaft] -gem "propshaft" +gem "propshaft", github: "rails/propshaft", branch: "main" # Use sqlite3 as the database for Active Record gem "sqlite3", ">= 1.4" # Use the Puma web server [https://github.com/puma/puma] diff --git a/Gemfile.lock b/Gemfile.lock index 993d80c..bab804b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,14 @@ +GIT + remote: https://github.com/rails/propshaft.git + revision: 40b578cc8741b08f718600777d1099ebd78456f6 + branch: main + specs: + propshaft (0.9.0) + actionpack (>= 7.0.0) + activesupport (>= 7.0.0) + rack + railties (>= 7.0.0) + GIT remote: https://github.com/rails/rails.git revision: 8ab3cbe665b10459e1a518002f16413696979f90 @@ -185,11 +196,6 @@ GEM parser (3.3.4.0) ast (~> 2.4.1) racc - propshaft (0.9.0) - actionpack (>= 7.0.0) - activesupport (>= 7.0.0) - rack - railties (>= 7.0.0) psych (5.1.2) stringio public_suffix (6.0.1) @@ -315,7 +321,7 @@ DEPENDENCIES debug importmap-rails jbuilder - propshaft + propshaft! puma (>= 5.0) rails! rubocop-rails-omakase