From 4c644c336bc96f6ce6658531e85fa5f3ec6683cf Mon Sep 17 00:00:00 2001 From: Steven Hancock Date: Wed, 9 May 2012 11:27:58 -0700 Subject: [PATCH] Actually only load rails admin in production mode This is what I think 28f8db51e79 was supposed to do. With the initializer in an "unless Rails.env.production?" block the entire initializer was being ignored in production mode and loaded in all other environments, but Rails Admin was still loading regardless of that. :grin: This only loads rails admin in production and excludes it from all other environments. Also keeps non-admins out of /admin_panel (without the initializer it was free-for-all) and temp fixes #3210 until a new gem is released. --- Gemfile | 2 +- config/initializers/rails_admin.rb | 2 +- config/routes.rb | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a4a4596be..37baada1f 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,6 @@ gem 'omniauth-tumblr' gem 'omniauth-twitter' gem 'twitter', '2.0.2' -gem 'rails_admin' # mail @@ -36,6 +35,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' gem 'rack-ssl', :require => 'rack/ssl' gem 'rack-rewrite', '~> 1.2.1', :require => false gem 'rack-piwik', :require => 'rack/piwik' diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb index bde0f64be..439c191a1 100644 --- a/config/initializers/rails_admin.rb +++ b/config/initializers/rails_admin.rb @@ -1,6 +1,6 @@ # RailsAdmin config file. Generated on March 24, 2012 15:34 # See github.com/sferik/rails_admin for more informations -unless Rails.env.production? +if Rails.env.production? RailsAdmin.config do |config| config.authorize_with do redirect_to main_app.root_path unless current_user.try(:admin?) diff --git a/config/routes.rb b/config/routes.rb index 7911f699c..5f468bff3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,9 @@ # the COPYRIGHT file. Diaspora::Application.routes.draw do - mount RailsAdmin::Engine => '/admin_panel', :as => 'rails_admin' + if Rails.env.production? + mount RailsAdmin::Engine => '/admin_panel', :as => 'rails_admin' + end get 'oembed' => 'posts#oembed', :as => 'oembed' # Posting and Reading