diff --git a/Gemfile b/Gemfile index ada39d8b..8b190042 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'will_paginate' gem 'nokogiri', '1.8.5' gem 'ransack', '~> 1.7' gem 'geocoder' -gem 'haml', '4.0.7' +gem 'haml', '5.0.0' gem 'simple_form' gem 'carrierwave' gem 'fog' diff --git a/Gemfile.lock b/Gemfile.lock index 60fa7b8a..72329c9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT - remote: git://github.com/Compass/compass-rails.git - revision: d600de4a6c5870613aac63f32491da4771a3c982 + remote: https://github.com/Compass/compass-rails.git + revision: f6391d0d30fa63bb9bf6cd94e0e5608012584e6e branch: master specs: - compass-rails (2.0.5) + compass-rails (4.0.0) compass (~> 1.0.0) sass-rails (< 5.1) - sprockets (< 2.13) + sprockets (< 4.0) GEM remote: https://rubygems.org/ @@ -73,7 +73,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) childprocess (3.0.0) - chunky_png (1.3.4) + chunky_png (1.4.0) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -148,7 +148,7 @@ GEM i18n (~> 0.5) faraday (0.12.2) multipart-post (>= 1.2, < 3) - ffi (1.11.3) + ffi (1.15.5) fission (0.5.0) CFPropertyList (~> 2.2) fog (1.41.0) @@ -348,7 +348,8 @@ GEM grpc (1.47.0) google-protobuf (~> 3.19) googleapis-common-protos-types (~> 1.0) - haml (4.0.7) + haml (5.0.0) + temple (>= 0.8.0) tilt hashdiff (0.3.7) hashie (3.5.7) @@ -482,8 +483,8 @@ GEM activesupport (>= 3.0, <= 5.1.1) i18n rb-fsevent (0.9.6) - rb-inotify (0.9.5) - ffi (>= 0.5.0) + rb-inotify (0.10.1) + ffi (~> 1.0) rb-readline (0.5.5) rbtree (0.4.5) rbvmomi (1.13.0) @@ -561,6 +562,7 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) + temple (0.8.2) term-ansicolor (1.3.2) tins (~> 1.0) terminal-table (1.5.2) @@ -621,7 +623,7 @@ DEPENDENCIES geocoder gibbon google-cloud-firestore - haml (= 4.0.7) + haml (= 5.0.0) hirb httparty i18n-tasks (~> 0.8.7)