From e60dd7d6abb056103e12cd38e25c64a7422a864b Mon Sep 17 00:00:00 2001 From: "E. Lynette Rayle" Date: Tue, 25 Feb 2020 17:08:03 -0500 Subject: [PATCH] tmp pin of sprockets sprockets 4 is incompatible with font-awesome 4.5. It is compatible with font-awesome 5.12. Ref: https://github.com/FortAwesome/font-awesome-sass/commit/b8dd32cf3bcd5d14c12543d767f8db68b31a6a9b https://github.com/rails/sprockets-rails/issues/269 https://github.com/rails/sprockets-rails/issues/333 --- Gemfile | 5 +++-- Gemfile.lock | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 59640bad..c096bd8b 100644 --- a/Gemfile +++ b/Gemfile @@ -77,8 +77,9 @@ group :test do # gem 'rspec-activemodel-mocks' end -# tmp pin of autoprefixer to avoid nodes version error -gem 'autoprefixer-rails', '8.5.2' +# tmp pins for incompatibilities +gem 'autoprefixer-rails', '8.5.2' # avoid nodes version error +gem 'sprockets', '3.7.2' # avoid err working with font-awesome 4.5 - corrected in 5.12 # ruby "2.5.3" # gem 'therubyracer', platforms: :ruby diff --git a/Gemfile.lock b/Gemfile.lock index 3cb1b72f..06296893 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -169,7 +169,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) connection_pool (2.2.2) coveralls (0.8.23) json (>= 1.8, < 3) @@ -428,7 +428,7 @@ GEM ruby-progressbar rubyzip spring (2.1.0) - sprockets (4.0.0) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-es6 (0.9.2) @@ -524,6 +524,7 @@ DEPENDENCIES sitemap_generator solr_wrapper (>= 0.3) spring + sprockets (= 3.7.2) sqlite3 turbolinks (~> 5) tzinfo-data