Merge pull request #2840 from koic/loosen_dependency_haml

Loosen the dependency version of Haml
railsadminteam · Feb 28, 2017 · 46cd7ec · 46cd7ec
2 parents bfdcf35 + 57d29d6
commit 46cd7ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/config/initializers/haml.rb b/config/initializers/haml.rb
@@ -1,2 +1,5 @@
 require 'haml'
-Haml::Template.options[:ugly] = true
+
+if Gem::Version.create(Haml::VERSION) < Gem::Version.create('5.0.0.beta.2')
+  Haml::Template.options[:ugly] = true
+end
diff --git a/rails_admin.gemspec b/rails_admin.gemspec
@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'builder', '~> 3.1'
   spec.add_dependency 'coffee-rails', '~> 4.0'
   spec.add_dependency 'font-awesome-rails', ['>= 3.0', '< 5']
-  spec.add_dependency 'haml', '~> 4.0'
+  spec.add_dependency 'haml', '>= 4.0', '< 6'
   spec.add_dependency 'jquery-rails', ['>= 3.0', '< 5']
   spec.add_dependency 'jquery-ui-rails', '~> 5.0'
   spec.add_dependency 'kaminari', '>= 0.14', '< 2.0'