Permalink
Browse files

Changed gem 'sinatra-content-for' to the better supported 'sinatra-co…

…ntrib'
  • Loading branch information...
1 parent 91bfb2a commit de338c1b4f661df65c4662f895558d53e7997157 @njh committed Dec 22, 2012
Showing with 12 additions and 5 deletions.
  1. +1 −1 Gemfile
  2. +10 −3 Gemfile.lock
  3. +1 −1 views/layout.erb
View
@@ -2,7 +2,7 @@ source "http://rubygems.org"
#ruby "1.8.7"
gem 'sinatra'
-gem 'sinatra-content-for', :require => 'sinatra/content_for'
+gem 'sinatra-contrib', :require => 'sinatra/content_for'
gem 'emk-sinatra-url-for', :require => 'sinatra/url_for'
gem 'json_pure', :require => 'json'
View
@@ -2,12 +2,14 @@ GEM
remote: http://rubygems.org/
specs:
addressable (2.2.8)
+ backports (2.6.5)
diff-lcs (1.1.3)
doodle (0.2.3)
emk-sinatra-url-for (0.2.1)
sinatra (>= 0.9.1.1)
equivalent-xml (0.2.9)
nokogiri (>= 1.4.3)
+ eventmachine (1.0.0)
fakeweb (1.3.0)
haml (3.1.4)
htmlentities (4.3.1)
@@ -58,8 +60,13 @@ GEM
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
- sinatra-content-for (0.1)
- sinatra
+ sinatra-contrib (1.3.2)
+ backports (>= 2.0)
+ eventmachine
+ rack-protection
+ rack-test
+ sinatra (~> 1.3.0)
+ tilt (~> 1.3)
tilt (1.3.3)
PLATFORMS
@@ -86,4 +93,4 @@ DEPENDENCIES
rspec (>= 2.7.0)
shotgun
sinatra
- sinatra-content-for
+ sinatra-contrib
View
@@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link type="text/css" rel="stylesheet" href="/css/cssreset-min.css" />
<link type="text/css" rel="stylesheet" href="/css/dbpedialite.css" />
- <% yield_content :head %>
+ <%= yield_content :head %>
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-15759799-2']);

0 comments on commit de338c1

Please sign in to comment.