Merge branch 'master' of github.com:middleman/middleman

This commit is contained in:
Thomas Reynolds 2013-06-04 09:48:45 -07:00
commit 39d3fa01ad

View file

@ -130,7 +130,7 @@ module Middleman
def server(&block)
@@servercounter ||= 0
@@servercounter += 1
const_set("MiddlemanApplication#{@@servercounter}", Class.new(Middleman::Application))
const_set("MiddlemanApplication#{@@servercounter}", Class.new(Middleman::Application, &block))
end
end
@ -142,7 +142,7 @@ module Middleman
#
# @return [Class]
def server(&block)
::Middleman::Application.server
::Middleman::Application.server(&block)
end
end