Merge pull request #719 from pgharts/fasten-haml-522

Fasten haml gem, >=5, <6
pgharts · Sep 27, 2023 · c79de04 · c79de04
2 parents a1a7873 + c0fbf50
commit c79de04
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.5.8)
+    trusty-cms (5.6.0)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.2.0)
@@ -10,7 +10,7 @@ PATH
       delocalize (>= 0.2, < 2.0)
       devise
       execjs (~> 2.7)
-      haml (= 6.1.2)
+      haml (>= 5.0, < 6.0)
       haml-rails
       highline (>= 1.7.8, < 2.2.0)
       image_processing
@@ -20,7 +20,7 @@ PATH
       rack (>= 2.0.1, < 3.1.0)
       rack-cache (~> 1.7)
       radius (~> 0.7)
-      rails (~> 6.1.7)
+      rails
       rake (< 14.0)
       rdoc (>= 5.1, < 7.0)
       roadie-rails
@@ -153,9 +153,8 @@ GEM
       mime-types (>= 1.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    haml (6.1.2)
-      temple (>= 0.8.2)
-      thor
+    haml (5.2.2)
+      temple (>= 0.8.0)
       tilt
     haml-rails (2.1.0)
       actionpack (>= 5.1)
@@ -372,4 +371,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   2.4.10
+   2.4.20
diff --git a/lib/trusty_cms.rb b/lib/trusty_cms.rb
@@ -2,6 +2,6 @@
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '5.5.9'.freeze
+    VERSION = '5.6.0'.freeze
   end
 end
diff --git a/trusty_cms.gemspec b/trusty_cms.gemspec
@@ -31,7 +31,7 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'delocalize',      '>= 0.2', '< 2.0'
   s.add_dependency 'devise'
   s.add_dependency 'execjs',          '~> 2.7'
-  s.add_dependency 'haml'
+  s.add_dependency 'haml',            '>= 5.0', '< 6.0'
   s.add_dependency 'haml-rails'
   s.add_dependency 'highline',        '>= 1.7.8', '< 2.2.0'
   s.add_dependency 'image_processing'