0
@@ -272,8 +272,11 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
0
     # this is crucial: load init file with all the preferences
0
     # then environment init file, then start enabling specific
0
     # components, load dependencies and update logger.
0
-    load_initfile unless Merb::disabled?(:initfile)
0
-    load_env_config
0
+    unless Merb::disabled?(:initfile)
0
+      load_initfile
0
+      load_env_config
0
+    end
0
+
0
     enable_json_gem unless Merb::disabled?(:json)
0
     load_dependencies
0
     update_logger
0
@@ -344,10 +347,6 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
0
       if File.exists?(initfile)
0
         STDOUT.puts "Loading init file from #{initfile}" unless Merb.testing?
0
         load(initfile)
0
-      elsif Merb.env != "test"
0
-        Merb.fatal! "You are not in a Merb application, or you are in " \
0
-          "a flat application and have not specified the init file. If you " \
0
-          "are trying to create a new merb application, use merb-gen app."
0
       end
0
     end
0
 end
0
@@ -478,7 +477,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
0
         reader_ary = [reader]
0
         loop do
0
           # wait for child to exit and capture exit status
0
-          # 
0
+          #
0
           #
0
           # WNOHANG specifies that wait2 exists without waiting
0
           # if no child process are ready to be noticed.