From 5f23b9b69644fa8bd03c20168c643c14b8bb6385 Mon Sep 17 00:00:00 2001
From: Alex Yule <alexy@codeforamerica.org>
Date: Wed, 20 Jun 2012 17:53:36 -0700
Subject: [PATCH] upgraded rails_admin to 0.0.4

---
 Gemfile      |  2 +-
 Gemfile.lock | 37 ++++++++++++++++---------------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1df1136..d5f4499 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ end
 
 gem 'jquery-rails'
 # gem 'flocky', :git => 'git://github.com/codeforamerica/flocky.git'
-gem 'rails_admin', :git => 'git://github.com/sferik/rails_admin.git'
+gem 'rails_admin', '~> 0.0.4' 
 gem 'tropo-webapi-ruby'
 gem 'factory_girl_rails', '~> 3.3.0'
 gem 'tropo-provisioning'
diff --git a/Gemfile.lock b/Gemfile.lock
index 945af1a..e9e691c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,3 @@
-GIT
-  remote: git://github.com/sferik/rails_admin.git
-  revision: c70beff76fdad15e09b197387ed0a8df4ee47924
-  specs:
-    rails_admin (0.0.1)
-      bbenezech-nested_form (~> 0.0.6)
-      bootstrap-sass (~> 2.0)
-      builder (~> 3.0)
-      coffee-rails (~> 3.1)
-      haml (~> 3.1)
-      jquery-rails (>= 1.0)
-      jquery-ui-rails (~> 0.2.2)
-      kaminari (~> 0.12)
-      rack-pjax (~> 0.5)
-      rails (~> 3.1)
-      remotipart (~> 1.0)
-      sass-rails (~> 3.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -53,7 +35,7 @@ GEM
     arel (3.0.2)
     bbenezech-nested_form (0.0.6)
     bcrypt-ruby (3.0.1)
-    bootstrap-sass (2.0.2)
+    bootstrap-sass (2.0.3.1)
     builder (3.0.0)
     cocoon (1.0.21)
     coffee-rails (3.2.2)
@@ -82,7 +64,7 @@ GEM
     faker (1.0.1)
       i18n (~> 0.4)
     googlecharts (1.6.8)
-    haml (3.1.4)
+    haml (3.1.6)
     hashie (1.2.0)
     hike (1.2.1)
     hpricot (0.8.6)
@@ -127,6 +109,19 @@ GEM
       activesupport (= 3.2.3)
       bundler (~> 1.0)
       railties (= 3.2.3)
+    rails_admin (0.0.4)
+      bbenezech-nested_form (~> 0.0.6)
+      bootstrap-sass (~> 2.0, >= 2.0.3)
+      builder (~> 3.0)
+      coffee-rails (~> 3.1)
+      haml (~> 3.1)
+      jquery-rails (>= 1.0.17)
+      jquery-ui-rails (~> 0.2.2)
+      kaminari (~> 0.12)
+      rack-pjax (~> 0.5)
+      rails (~> 3.1)
+      remotipart (~> 1.0)
+      sass-rails (~> 3.1)
     railties (3.2.3)
       actionpack (= 3.2.3)
       activesupport (= 3.2.3)
@@ -223,7 +218,7 @@ DEPENDENCIES
   jquery-rails
   pg
   rails (= 3.2.3)
-  rails_admin!
+  rails_admin (~> 0.0.4)
   rspec-rails
   sass-rails (~> 3.2.3)
   shoulda