diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 index a01ec2d..5f5013e --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'meta_where' # gem 'rails', :git => 'git://github.com/rails/rails.git' gem 'rake', '0.8.7' gem 'delayed_job' -gem 'haml', '~>4.0.5' +gem 'haml', '~>5.0.0' #gem 'sass' gem 'libxml-ruby' gem 'pg', '0.17.1' diff --git a/Gemfile.lock b/Gemfile.lock index ccb302f..22425a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,8 @@ GEM factory_girl (~> 4.9.0) railties (>= 3.0.0) fastercsv (1.5.5) - haml (4.0.7) + haml (5.0.0) + temple (>= 0.8.0) tilt hashie (3.6.0) i18n (0.5.4) @@ -144,10 +145,11 @@ GEM spreadsheet (1.2.3) ruby-ole (>= 1.0) sprockets (1.0.2) + temple (0.8.2) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) thor (0.14.6) - tilt (2.0.9) + tilt (2.0.10) treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -165,7 +167,7 @@ DEPENDENCIES delayed_job factory_girl_rails fastercsv - haml (~> 4.0.5) + haml (~> 5.0.0) json libxml-ruby meta_where