diff --git a/Gemfile.lock b/Gemfile.lock index 32cfa4a..6b00f2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ PATH draper (~> 1.3) fluentd (>= 0.10.56, < 0.14) font-awesome-rails - haml-rails (~> 0.5.3) + haml-rails (~> 1.0) httpclient (~> 2.5) jbuilder (~> 2.0) jquery-rails (~> 3.1.0) @@ -132,15 +132,22 @@ GEM railties (>= 3.2, < 6.0) globalid (0.4.1) activesupport (>= 4.2.0) - haml (4.0.7) + haml (5.0.4) + temple (>= 0.8.0) tilt - haml-rails (0.5.3) + haml-rails (1.0.0) actionpack (>= 4.0.1) activesupport (>= 4.0.1) - haml (>= 3.1, < 5.0) + haml (>= 4.0.6, < 6.0) + html2haml (>= 1.0.1) railties (>= 4.0.1) hike (1.2.3) hitimes (1.2.6) + html2haml (2.2.0) + erubis (~> 2.7.0) + haml (>= 4.0, < 6) + nokogiri (>= 1.6.0) + ruby_parser (~> 3.5) http-cookie (1.0.3) domain_name (~> 0.5) http_parser.rb (0.6.0) @@ -249,6 +256,8 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) + ruby_parser (3.11.0) + sexp_processor (~> 4.9) rubyzip (1.2.1) safe_yaml (1.0.4) sass (3.2.19) @@ -258,6 +267,7 @@ GEM sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) settingslogic (2.0.9) + sexp_processor (4.11.0) sigdump (0.2.4) simplecov (0.16.1) docile (~> 1.1) @@ -277,6 +287,7 @@ GEM string-scrub (0.0.5) sucker_punch (1.6.0) celluloid (~> 0.17.2) + temple (0.8.0) thor (0.20.0) thread_safe (0.3.6) tilt (1.4.1) diff --git a/fluentd-ui.gemspec b/fluentd-ui.gemspec index ac9845b..9b33897 100644 --- a/fluentd-ui.gemspec +++ b/fluentd-ui.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'addressable' spec.add_dependency "font-awesome-rails" spec.add_dependency 'sass-rails', '~> 4.0.3' - spec.add_dependency "haml-rails", "~> 0.5.3" + spec.add_dependency "haml-rails", "~> 1.0" spec.add_dependency 'jquery-rails', "~> 3.1.0" spec.add_dependency 'jbuilder', '~> 2.0' spec.add_dependency "draper", '~> 1.3'