From 4cf27d4248f654a166407def101813f2b9fa2b9b Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 28 Aug 2012 00:23:11 -0700
Subject: [PATCH] use a fork of rails admin due to default proc problem
 override use in rails admin

---
 Gemfile      |  2 +-
 Gemfile.lock | 33 +++++++++++++++++++--------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5ee682f47..9b5044da1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,7 @@ gem 'newrelic_rpm'
 gem "rpm_contrib", "~> 2.1.7"
 
 group :production do # we don't install these on travis to speed up test runs
-  gem 'rails_admin', '~> 0.0.3'
+  gem 'rails_admin', :git => 'git://github.com/halida/rails_admin.git'
   gem 'fastercsv', '1.5.5', :require => false
   gem 'rack-ssl', :require => 'rack/ssl'
   gem 'rack-rewrite', '~> 1.2.1', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 4fa985e6e..8cfc26d66 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,21 @@
+GIT
+  remote: git://github.com/halida/rails_admin.git
+  revision: 590dceb10812a9207e42dbccecd5d1031715ae80
+  specs:
+    rails_admin (0.0.3)
+      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)
+
 GIT
   remote: https://github.com/Empact/roxml.git
   revision: 7ea9a9ffd2338aaef5b04cb792060ae8c98f346a
@@ -331,19 +349,6 @@ GEM
       railties (= 3.2.6)
     rails-i18n (0.6.5)
       i18n (~> 0.5)
-    rails_admin (0.0.3)
-      bbenezech-nested_form (~> 0.0.6)
-      bootstrap-sass (~> 2.0)
-      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)
     rails_autolink (1.0.9)
       rails (~> 3.1)
     railties (3.2.6)
@@ -528,7 +533,7 @@ DEPENDENCIES
   rack-ssl
   rails (= 3.2.6)
   rails-i18n
-  rails_admin (~> 0.0.3)
+  rails_admin!
   rails_autolink
   redcarpet (= 2.1.1)
   remotipart (~> 1.0)