From 599541f43051137154eb969f526eaa53336fa0ed Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Wed, 10 Apr 2013 17:08:23 +0200
Subject: [PATCH] Upgrade gemfile

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1d3a8867..97af3604 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,7 @@ gem 'simply_stored' , :git => 'git://github.com/bterkuile/simply_stored.git'
 gem 'devise', '2.0.4'
 gem 'devise_simply_stored'
 gem 'simple_form'
-gem 'active_decorator', path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
+gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
 gem 'cmtool', github: 'bterkuile/cmtool'
 gem 'kaminari'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 22bf12cb..3a3881bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,11 +34,6 @@ GIT
       couch_potato (>= 0.2.15)
       rest-client (>= 1.4.2)
 
-PATH
-  remote: /Users/bterkuile/companytools/development/rails/components/active_decorator
-  specs:
-    active_decorator (0.3.4)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -55,6 +50,7 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
+    active_decorator (0.3.4)
     activemodel (3.2.13)
       activesupport (= 3.2.13)
       builder (~> 3.0.0)
@@ -284,7 +280,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    subexec (0.2.2)
+    subexec (0.2.3)
     temple (0.6.3)
     thin (1.5.1)
       daemons (>= 1.0.9)
@@ -311,7 +307,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_decorator!
+  active_decorator
   bootstrap-sass
   bourbon
   cmtool!