From 8deced77c766fda29253fc20925b99f6082d8f7a Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Fri, 20 Dec 2013 23:44:12 +0000
Subject: [PATCH] * pinning aws-sdk to 1.29.1 everywhere because the gem
 released today is broken

---
 admin/Gemfile             | 2 +-
 web/Gemfile               | 3 ++-
 websocket-gateway/Gemfile | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/admin/Gemfile b/admin/Gemfile
index 6a249b8fc..0dfe6961f 100644
--- a/admin/Gemfile
+++ b/admin/Gemfile
@@ -46,7 +46,7 @@ gem 'unf', '0.1.3' #optional fog dependency
 gem 'country-select'
 gem 'aasm', '3.0.16'
 gem 'postgres-copy', '0.6.0'
-gem 'aws-sdk'
+gem 'aws-sdk', '1.29.1'
 gem 'bugsnag' 
 
 
diff --git a/web/Gemfile b/web/Gemfile
index 45743913c..f83b5e420 100644
--- a/web/Gemfile
+++ b/web/Gemfile
@@ -56,6 +56,7 @@ gem 'postgres-copy'
 #end
 gem 'geokit-rails'
 gem 'postgres_ext'
+gem 'haml-rails'
 
 gem 'quiet_assets', :group => :development
 
@@ -98,7 +99,7 @@ end
   gem 'rack-test'
   # gem 'rb-fsevent', '0.9.1', :require => false
   # gem 'growl', '1.0.3'
-  gem 'poltergeist'
+  gem 'poltergeist', :path => '/Users/seth/workspace/poltergeist/'
 end
 
 
diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile
index 47f7d59c3..301837131 100644
--- a/websocket-gateway/Gemfile
+++ b/websocket-gateway/Gemfile
@@ -33,7 +33,7 @@ gem 'aasm', '3.0.16'
 gem 'carrierwave'
 gem 'devise'
 gem 'postgres-copy'
-gem 'aws-sdk'
+gem 'aws-sdk', '1.29.1'
 gem 'bugsnag'
 gem 'geokit-rails'
 gem 'postgres_ext'