From 8ef49586c30d5b173b259180929f66a0c4290fe6 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 3 Apr 2012 23:02:16 -0700
Subject: [PATCH] update foreman

---
 Gemfile            | 2 +-
 Gemfile.lock       | 5 ++---
 app/models/user.rb | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 94ce8716d..992166e92 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '3.1.4'
 gem 'rails_autolink'
 gem 'bundler', '~> 1.1.0'
-gem 'foreman', '0.34.1'
+gem 'foreman', '0.41'
 gem 'whenever'
 
 gem 'thin', '~> 1.3.1',    :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index cace865ff..305161d56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,8 +182,7 @@ GEM
       ruby-hmac
     foreigner (1.1.5)
       activerecord (>= 3.0.0)
-    foreman (0.34.1)
-      term-ansicolor (~> 1.0.5)
+    foreman (0.41.0)
       thor (>= 0.13.6)
     formatador (0.2.1)
     fuubar (0.0.6)
@@ -493,7 +492,7 @@ DEPENDENCIES
   fixture_builder (= 0.3.1)
   fog
   foreigner (~> 1.1.0)
-  foreman (= 0.34.1)
+  foreman (= 0.41)
   fuubar (= 0.0.6)
   guard-cucumber
   guard-rspec
diff --git a/app/models/user.rb b/app/models/user.rb
index 129c32430..6ef72045c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,7 +4,6 @@
 
 require File.join(Rails.root, 'lib/salmon/salmon')
 require File.join(Rails.root, 'lib/postzord/dispatcher')
-require 'rest-client'
 
 class User < ActiveRecord::Base
   include Encryptor::Private