From 6d468e229ef2cf9cb11e46cae036f269ea0ce26b Mon Sep 17 00:00:00 2001
From: Dan Rice <dan@zoombody.com>
Date: Fri, 2 May 2014 11:26:10 -0400
Subject: [PATCH] Use latest Tolk release, which supports Rails 4

---
 Gemfile      |  2 +-
 Gemfile.lock | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4a2bffd0..34284496 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,7 +44,7 @@ gem 'bcrypt-ruby', '~> 3.0.0'
 
 group :development do
   gem "yard"
-  gem "tolk", git: 'https://github.com/tolk/tolk'
+  gem 'tolk', '>=1.5.0'
   gem "bullet"
   gem "rack-mini-profiler"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 8bc8c494..ca09c01f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,14 +14,6 @@ GIT
     actionpack-xml_parser (1.0.1)
       actionpack (>= 4.0.0, < 5)
 
-GIT
-  remote: https://github.com/tolk/tolk
-  revision: 06f99b3b747f2f8f7297fa35ec9c9d5f38eaada6
-  specs:
-    tolk (1.4.00)
-      safe_yaml (~> 0.8)
-      will_paginate
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -192,6 +184,9 @@ GEM
       atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     timecop (0.6.3)
+    tolk (1.5.0)
+      safe_yaml (~> 0.8)
+      will_paginate
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -242,7 +237,7 @@ DEPENDENCIES
   swf_fu
   therubyracer
   timecop (~> 0.6.2)
-  tolk!
+  tolk (>= 1.5.0)
   uglifier (>= 1.3.0)
   will_paginate
   yard