From 672eb1674fb06f087027333e36cd2167c8a38a37 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 17 Apr 2012 10:19:54 -0700
Subject: [PATCH] use rails admin gem, not the smaller git repo.  NOTE: I will
 delete diaspora/rails_admin_smaller in about a week to let people who pulled
 it get off of it

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

diff --git a/Gemfile b/Gemfile
index 1ac185921..772932fe4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem 'omniauth-tumblr'
 gem 'omniauth-twitter'
 
 gem 'twitter', '2.0.2'
-gem 'rails_admin', :git => 'git://github.com/diaspora/rails_admin_smaller.git'
+gem 'rails_admin'
 
 # mail
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5db82fdb8..e84100d7a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,24 +34,6 @@ GIT
       rack-fiber_pool
       sinatra
 
-GIT
-  remote: git://github.com/diaspora/rails_admin_smaller.git
-  revision: bd66ed784081e13ff383171b1d541ce1c299f722
-  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)
-
 GIT
   remote: git://github.com/pivotal/jasmine-gem.git
   revision: c72e8d248d49a1ebe53f31a09ac511194ad4edf1
@@ -370,6 +352,19 @@ GEM
       railties (= 3.1.4)
     rails-i18n (0.6.3)
       i18n (~> 0.5)
+    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)
     rails_autolink (1.0.6)
       rails (~> 3.1)
     railties (3.1.4)
@@ -570,7 +565,7 @@ DEPENDENCIES
   rack-ssl
   rails (= 3.1.4)
   rails-i18n
-  rails_admin!
+  rails_admin
   rails_autolink
   redcarpet (= 2.0.1)
   remotipart (~> 1.0)