5 commits

Author	SHA1	Message	Date
Thomas Reynolds	c94e5d0f4d	Merge from stable	2015-02-24 11:16:16 -08:00
Thomas Ritz	262e976790	Fixes computation of parent. ... If there is a file without a basename in root, e.g. `.htaccess`, `#parent` of another file in root finds `.htaccess` instead of `index.html`. Adding the `.htaccess` to the traversal-app fixture exposes this error. The fix is to no longer scan for possible files if we know the parent must be root.	2015-02-21 19:07:17 +01:00
Thomas Reynolds	bedf235ff6	Multiple Source watchers	2014-07-20 18:57:22 -07:00
Ben Hollis	efe1d45af7	Rewrite sitemap_traversal tests to better reflect what should actually happen, and to expose a bug in current_page.	2012-03-07 22:08:41 -08:00
Thomas Reynolds	c8a134a386	split into middleman-core and middleman-more	2011-12-29 15:09:51 -08:00