prep beta.2
This commit is contained in:
parent
4626193f97
commit
486d34a2c1
|
@ -1,6 +1,14 @@
|
|||
master
|
||||
===
|
||||
|
||||
# 4.0.0.beta.2
|
||||
|
||||
* Fixed regression causing exceptions to be silently thrown away outside of `--verbose` mode in the dev server.
|
||||
* Pull in `--ssl` option from stable.
|
||||
* Replace `hooks` gem with custom callback solution.
|
||||
|
||||
# 4.0.0.beta.1
|
||||
|
||||
* Add `resources` class method to extensions to allow simple string-based resource generation.
|
||||
* rename `app.add_to_instance` to `Extension.expose_to_application` for adding extension-local methods to the shared app instance.
|
||||
* rename `app.add_to_config_context` to `Extension.expose_to_config` for adding extension-local methods to the sandboxed scope of `config.rb`
|
||||
|
|
|
@ -294,10 +294,10 @@ module Middleman
|
|||
end
|
||||
|
||||
env_config = File.join(root, 'environments', "#{config[:environment]}.rb")
|
||||
if File.exist? env_config
|
||||
logger.debug "== Reading: #{config[:environment]} config"
|
||||
config_context.instance_eval File.read(env_config), env_config, 1
|
||||
end
|
||||
return unless File.exist? env_config
|
||||
|
||||
logger.debug "== Reading: #{config[:environment]} config"
|
||||
config_context.instance_eval File.read(env_config), env_config, 1
|
||||
end
|
||||
|
||||
# Clean up missing Tilt exts
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
require 'rack/showexceptions'
|
||||
|
||||
|
||||
# Support rack/showexceptions during development
|
||||
module Middleman::CoreExtensions
|
||||
class ShowExceptions < ::Middleman::Extension
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
module Middleman
|
||||
# Current Version
|
||||
# @return [String]
|
||||
VERSION = '4.0.0.beta.1' unless const_defined?(:VERSION)
|
||||
VERSION = '4.0.0.beta.2' unless const_defined?(:VERSION)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue