diff --git a/CHANGELOG.md b/CHANGELOG.md index 751cd5b2..ef5780ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ master === +# 4.1.4 + +* Unify default extensions for all URL processing extensions. #1855 +* Fix URL regex for `content: ` context of CSS. #1853 +* Make sure CLI config over-rides `config.rb` order. +* Fix relative assets in some contexts. #1842 + +# 4.1.3 + * Expose all top-level config options to CLI (flags now match config. latency -> watcher_latency, etc). * Fix directory indexes with `.htm` and `.xhtml` files. #1821 diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index bd019e00..b10076d7 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -176,12 +176,10 @@ module Middleman # Use configuration values to set `bind_address` etc. in # `server_information` - server_information.use({ - bind_address: possible_from_cli(:bind_address, app.config), - port: possible_from_cli(:port, app.config), - server_name: possible_from_cli(:server_name, app.config), - https: possible_from_cli(:https, app.config) - }) + server_information.use(bind_address: possible_from_cli(:bind_address, app.config), + port: possible_from_cli(:port, app.config), + server_name: possible_from_cli(:server_name, app.config), + https: possible_from_cli(:https, app.config)) app.logger.warn format('== The Middleman uses a different port "%s" then the configured one "%s" because some other server is listening on that port.', server_information.port, configured_port) unless server_information.port == configured_port