diff --git a/Gemfile b/Gemfile index 2f18936..6a10e38 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'rails', '3.2.7' gem 'pg', '0.14.0' gem 'omniauth-twitter' gem 'twitter_oauth', '~> 0.4.3' -gem 'haml', '3.1.6' +gem 'haml', '5.0.0' gem 'kaminari' diff --git a/Gemfile.lock b/Gemfile.lock index ae17b28..f79f6a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,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) @@ -181,6 +183,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) @@ -214,7 +217,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) kaminari launchy (= 2.1.2)