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

Merge branch 'master' into master

Browse source
This commit is contained in:
James 2016-01-28 08:18:01 +00:00
parent 475fa41de0 e169d3d07e
commit 17f5f19002
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -151,6 +151,7 @@ module Middleman
config[:ssl_private_key] = opts[:ssl_private_key] if opts[:ssl_private_key] config[:ssl_private_key] = opts[:ssl_private_key] if opts[:ssl_private_key]
ready do ready do
unless config[:watcher_disable]
match_against = [ match_against = [
%r{^config\.rb$}, %r{^config\.rb$},
%r{^environments/[^\.](.*)\.rb$}, %r{^environments/[^\.](.*)\.rb$},
@ -163,7 +164,6 @@ module Middleman
path: root, path: root,
only: match_against only: match_against
unless config[:watcher_disable]
# Hack around node_modules in root. # Hack around node_modules in root.
watcher.listener.ignore(/^node_modules/) watcher.listener.ignore(/^node_modules/)