From 59a47aff1c97bc8d630d77b70f6b78914e2603c4 Mon Sep 17 00:00:00 2001 From: Jack Dempsey Date: Sun, 18 May 2008 23:33:45 -0400 Subject: [PATCH] make nice for windows - remove app level loading (is handled in rakefile in merb-more now --- lib/merb-core/tasks/merb.rb | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/lib/merb-core/tasks/merb.rb b/lib/merb-core/tasks/merb.rb index 449f7b0..3812251 100644 --- a/lib/merb-core/tasks/merb.rb +++ b/lib/merb-core/tasks/merb.rb @@ -1,4 +1,2 @@ -Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext } +Dir[File.dirname(__FILE__) / '*.rake'].each { |ext| load ext } -# Load any app level custom rakefile extensions -Dir["#{Merb.root}/lib/tasks/**/*.rake"].sort.each { |ext| load ext } -- 1.5.3.7