diff --git a/CHANGELOG.md b/CHANGELOG.md index eb554d11..22202562 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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` diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb index b275d69c..9d8a239d 100644 --- a/middleman-core/lib/middleman-core/application.rb +++ b/middleman-core/lib/middleman-core/application.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 diff --git a/middleman-core/lib/middleman-core/core_extensions/show_exceptions.rb b/middleman-core/lib/middleman-core/core_extensions/show_exceptions.rb index 4bcde9e4..6f01448a 100644 --- a/middleman-core/lib/middleman-core/core_extensions/show_exceptions.rb +++ b/middleman-core/lib/middleman-core/core_extensions/show_exceptions.rb @@ -1,6 +1,5 @@ require 'rack/showexceptions' - # Support rack/showexceptions during development module Middleman::CoreExtensions class ShowExceptions < ::Middleman::Extension diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb index 960a86d7..269aebb3 100644 --- a/middleman-core/lib/middleman-core/version.rb +++ b/middleman-core/lib/middleman-core/version.rb @@ -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