diff --git a/Gemfile b/Gemfile index 9086d51..24ca309 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ end group :assets do gem 'sass-rails', '3.2.5' gem 'coffee-rails', '3.2.2' - gem 'haml', '3.1.6' + gem 'haml', '5.0.0' gem 'uglifier', '1.2.7' gem 'compass-rails', '~> 1.0.3' gem 'zurb-foundation', '~> 3.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 9cbd727..196b602 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,9 @@ GEM guard-spork (0.3.2) guard (>= 0.8.4) spork (>= 0.8.4) - haml (3.1.6) + haml (5.0.0) + temple (>= 0.8.0) + tilt hashie (1.2.0) hike (1.2.1) i18n (0.6.0) @@ -176,6 +178,7 @@ GEM hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + temple (0.8.2) thor (0.15.4) tilt (1.3.3) treetop (1.4.10) @@ -208,7 +211,7 @@ DEPENDENCIES faker guard-rspec (= 1.2.1) guard-spork (= 0.3.2) - haml (= 3.1.6) + haml (= 5.0.0) jquery-rails (= 2.0.2) launchy (= 2.1.2) omniauth-twitter