remove dependencies to HAML (which should be required in Wagon instead)

did committed Jun 01, 2016
commit ff29e06fe09cb230e3761eddca66d31b43b72730
Showing 6 changed files with 5 additions and 4 deletions
Gemfile +1 -0
@@ @@ -11,6 +11,7 @@ group :development do
# gem 'thin'
gem 'puma'
gem 'yui-compressor', '~> 0.12.0'
+ gem 'haml', '~> 4.0.6'
gem 'rack-mini-profiler'
gem 'flamegraph'
Gemfile.lock +1 -1
@@ @@ -9,7 +9,6 @@ PATH
compass (~> 1.0.3)
dragonfly (~> 1.0.12)
duktape (~> 1.3.0.6)
- haml (~> 4.0.6)
httparty (~> 0.13.6)
kramdown (~> 1.10.0)
locomotivecms-solid (~> 4.0.1)
@@ @@ -199,6 +198,7 @@ DEPENDENCIES
codeclimate-test-reporter (~> 0.4.7)
coveralls (~> 0.8.1)
flamegraph
+ haml (~> 4.0.6)
i18n-spec (~> 0.6.0)
json_spec (~> 1.1.4)
locomotivecms_steam!
locomotive/steam/decorators/template_decorator.rb b/lib/locomotive/steam/decorators/template_decorator.rb +0 -1
@@ @@ -1,4 +1,3 @@
- require 'haml'
require_relative 'i18n_decorator'
module Locomotive
locomotive/steam/server.rb b/lib/locomotive/steam/server.rb +1 -1
@@ @@ -1,4 +1,4 @@
- require 'haml'
+ # require 'haml'
require 'mimetype_fu'
require 'mime-types'
require 'mime/types'
locomotivecms_steam.gemspec +0 -1
@@ @@ -41,7 +41,6 @@ Gem::Specification.new do |spec|
spec.add_dependency 'kramdown', '~> 1.10.0'
spec.add_dependency 'RedCloth', '~> 4.2.9'
- spec.add_dependency 'haml', '~> 4.0.6'
spec.add_dependency 'mimetype-fu', '~> 0.1.2'
spec.add_dependency 'mime-types', '~> 2.6.1'
spec.add_dependency 'duktape', '~> 1.3.0.6'
spec/support/helpers.rb +2 -0
@@ @@ -23,6 +23,8 @@ module Spec
end
def run_server
+ require 'haml'
+
output = ENV['STEAM_VERBOSE'] ? nil : File.join(default_fixture_site_path, 'log/steam.log')
setup_common(output)