From dc5f5c48a87729cfd9125910a73d982af2e2c1c3 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Wed, 18 Dec 2013 15:47:02 +0000
Subject: [PATCH] * trying to fix admin based on stuff that broke in develop
 branch on Nov 5

---
 admin/Gemfile | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/admin/Gemfile b/admin/Gemfile
index 7d49040dd..6a249b8fc 100644
--- a/admin/Gemfile
+++ b/admin/Gemfile
@@ -33,21 +33,24 @@ group :assets do
 end
 gem 'will_paginate', '3.0.3'
 gem 'bootstrap-will_paginate', '0.0.6'
-gem 'carrierwave'
+gem 'carrierwave', '0.9.0'
 gem 'uuidtools', '2.1.2'
 gem 'bcrypt-ruby', '3.0.1'
 gem 'jquery-rails', '2.3.0' # pinned because jquery-ui-rails was split from jquery-rails, but activeadmin doesn't support this gem yet
 gem 'rails3-jquery-autocomplete'
-gem 'activeadmin'
-gem "meta_search", '>= 1.1.0.pre'
-gem 'fog',  "~> 1.3.1"
+gem 'activeadmin', '0.6.2'
+gem 'mime-types', '1.25'
+gem 'meta_search'
+gem 'fog',  "~> 1.18.0"
+gem 'unf', '0.1.3' #optional fog dependency
 gem 'country-select'
 gem 'aasm', '3.0.16'
-gem 'postgres-copy'
+gem 'postgres-copy', '0.6.0'
 gem 'aws-sdk'
-gem 'bugsnag'
+gem 'bugsnag' 
 
-gem 'eventmachine', '1.0.0'
+
+gem 'eventmachine', '1.0.3'
 gem 'amqp', '0.9.8'
 gem 'logging-rails', :require => 'logging/rails'
 
@@ -56,6 +59,9 @@ gem 'ruby-protocol-buffers', '1.2.2'
 
 gem 'sendgrid', '1.1.0'
 
+gem 'geokit-rails'
+gem 'postgres_ext', '1.0.0'
+
 group :libv8 do
   gem 'libv8', "~> 3.11.8"
 end