deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

prep

Browse source
This commit is contained in:
Thomas Reynolds 2016-03-22 12:34:03 -07:00
parent ebc2baa13f
commit bca8b854dd
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGELOG.md
View file

@ -1,6 +1,15 @@
master 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). * 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 * Fix directory indexes with `.htm` and `.xhtml` files. #1821

6
middleman-core/lib/middleman-core/preview_server.rb
View file

@ -176,12 +176,10 @@ module Middleman
# Use configuration values to set `bind_address` etc. in # Use configuration values to set `bind_address` etc. in
# `server_information` # `server_information`
server_information.use({ server_information.use(bind_address: possible_from_cli(:bind_address, app.config),
bind_address: possible_from_cli(:bind_address, app.config),
port: possible_from_cli(:port, app.config), port: possible_from_cli(:port, app.config),
server_name: possible_from_cli(:server_name, app.config), server_name: possible_from_cli(:server_name, app.config),
https: possible_from_cli(:https, 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 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