diff --git a/Gemfile b/Gemfile index 589d24b4..532a56a3 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'devise' gem 'exception_notification_rails3', '1.2.0', :require => 'exception_notifier' gem 'fastercsv' gem 'formtastic' -gem 'haml', '3.1.2' +gem 'haml', '5.0.0' gem 'inherited_resources', '1.3.0' gem 'lazy_high_charts', '~> 1.1.5' gem 'meta_search' diff --git a/Gemfile.lock b/Gemfile.lock index 1d6f27a6..61c95d0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,7 +87,9 @@ GEM guard-spork (0.3.1) guard (>= 0.8.4) spork (>= 0.8.4) - haml (3.1.2) + haml (5.0.0) + temple (>= 0.8.0) + tilt has_scope (0.5.1) highline (1.6.2) hike (1.2.1) @@ -227,6 +229,7 @@ GEM sqlite3 (1.3.4) sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) + temple (0.8.2) therubyracer (0.9.4) libv8 (~> 3.3.10) thor (0.14.6) @@ -263,7 +266,7 @@ DEPENDENCIES formtastic guard-rspec guard-spork - haml (= 3.1.2) + haml (= 5.0.0) hpricot inherited_resources (= 1.3.0) jquery-rails (= 1.0.13)