public
Rubygem
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-core.git
Fixed warning about STATUS_CODES due to 2 requires.

Signed-off-by: Michael S. Klishin <michael@novemberain.com>
djwonk (author)
Sun Oct 12 18:14:07 -0700 2008
michaelklishin (committer)
Sun Oct 12 19:31:06 -0700 2008
commit  5078b8bf11f23b1f4e42c701438c37c6140fd93e
tree    745c53f7251cd27048a069865f4052ec652f6dd9
parent  c122ec92e2defdddb6ed1fc6b317990696f74b45
...
29
30
31
32
33
34
35
...
29
30
31
 
 
 
 
0
@@ -29,7 +29,3 @@ require "merb-core/controller/merb_controller"
0
 module Merb
0
   module InlineTemplates; end
0
 end
0
-
0
-# StatusCodes does not autoload properly if placed with the above autoload
0
-# statements.  ControllerExceptions depends upon StatusCodes loading first.
0
-require "merb-core/controller/status_codes"
...
1
2
 
3
4
5
...
82
83
84
85
 
86
87
88
...
1
 
2
3
4
5
...
82
83
84
 
85
86
87
88
0
@@ -1,5 +1,5 @@
0
 module Merb
0
-    
0
+
0
   module StatusCodes
0
 
0
     STATUS_CODES = []
0
@@ -82,7 +82,7 @@ module Merb
0
     class ServiceUnavailable          < Merb::StatusCodes::ServerError; def self.status; 503 end end
0
     class GatewayTimeout              < Merb::StatusCodes::ServerError; def self.status; 504 end end
0
     class HTTPVersionNotSupported     < Merb::StatusCodes::ServerError; def self.status; 505 end end
0
-    
0
+
0
     STATUS_CODES.each do |item|
0
       item[:status] = item[:child_class].status
0
     end

Comments