diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-20 17:11:41 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-20 18:12:44 -0700 |
| commit | 5f222c524ed00b2ac805e267f70a916cf8f9bc77 (patch) | |
| tree | 1689d5d964cccc5a902449dd9de86705f831a5d8 /railties/lib/rails_generator.rb | |
| parent | 3694227f24d0f220c0ce7ef6c7f51598e2715d2d (diff) | |
| download | rails-5f222c524ed00b2ac805e267f70a916cf8f9bc77.tar.gz rails-5f222c524ed00b2ac805e267f70a916cf8f9bc77.tar.bz2 rails-5f222c524ed00b2ac805e267f70a916cf8f9bc77.zip | |
Remove 'core' fluff. Hookable ActiveSupport.load_all!
Diffstat (limited to 'railties/lib/rails_generator.rb')
| -rw-r--r-- | railties/lib/rails_generator.rb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb index 201a9e0f91..85400932dd 100644 --- a/railties/lib/rails_generator.rb +++ b/railties/lib/rails_generator.rb @@ -21,16 +21,9 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -begin - require 'active_support' -rescue LoadError - activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" - if File.directory?(activesupport_path) - $:.unshift activesupport_path - require 'active_support' - end -end -require 'active_support/core/all' +activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" +$:.unshift(activesupport_path) if File.directory?(activesupport_path) +require 'active_support/all' $:.unshift(File.dirname(__FILE__)) require 'rails_generator/base' |