From a26543b4a51f4adb42d531440c7475f9c733e16b Mon Sep 17 00:00:00 2001 From: maxwell Date: Wed, 18 Aug 2010 21:22:49 -0700 Subject: [PATCH 3/5] rolling back --- Gemfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index f2b895e32..660c818b0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,9 @@ source 'http://rubygems.org' -gem 'rails', '3.0.0.rc' -gem 'bundler', '1.0.0.rc.5' -#gem 'rails', '3.0.0.beta4' -#gem 'bundler', '0.9.26' +#gem 'rails', '3.0.0.rc' +#gem 'bundler', '1.0.0.rc.5' +gem 'rails', '3.0.0.beta4' +gem 'bundler', '0.9.26' #Security gem 'devise', :git => 'http://github.com/BadMinus/devise.git' From ff412770889707ab46b1e7594e7c7312457aa262 Mon Sep 17 00:00:00 2001 From: maxwell Date: Wed, 18 Aug 2010 21:34:02 -0700 Subject: [PATCH 5/5] one thing beta couldnt handle --- config/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index 206139b5e..bbceb6f94 100644 --- a/config/application.rb +++ b/config/application.rb @@ -15,7 +15,7 @@ module Diaspora # -- all .rb files in that directory are automatically loaded. # Add additional load paths for your own custom dirs - config.autoload_paths += %W(#{config.root}/lib) + #config.autoload_paths += %W(#{config.root}/lib) # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named