From 61f40fc6bfe6bb859c995023b5a17d22c9b5e6e5 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 28 Aug 2012 00:19:35 -0700
Subject: [PATCH] Revert "rails admin is conflicting with client side
 validations: see https://github.com/sferik/rails_admin/issues/985"

This reverts commit b70165b97f6636cd081b4f0007c3ba7161944fb0.
---
 config/routes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index ec772a54db..3fa0449b93 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 Diaspora::Application.routes.draw do
-  if Rails.env.production? && !ENV['RAILS_ADMIN']
+  if Rails.env.production?
     mount RailsAdmin::Engine => '/admin_panel', :as => 'rails_admin'
   end
 
-- 
GitLab