Merge branch 'master' of github.com:tdreyno/middleman
This commit is contained in:
commit
41f4a30824
|
@ -15,6 +15,7 @@ Feature: Builder
|
|||
Then "spaces in file.html" should exist at "test-app" and include "spaces"
|
||||
Then "images/Read me (example).txt" should exist at "test-app"
|
||||
Then "images/Child folder/regular_file(example).txt" should exist at "test-app"
|
||||
Then ".htaccess" should exist at "test-app"
|
||||
|
||||
Scenario: Build glob
|
||||
Given a built app at "glob-app" with flags "--glob '*.css'"
|
||||
|
|
1
fixtures/test-app/source/.htaccess
Normal file
1
fixtures/test-app/source/.htaccess
Normal file
|
@ -0,0 +1 @@
|
|||
# I'm an htaccess file!
|
|
@ -101,7 +101,7 @@ module Middleman::Sitemap
|
|||
def touch_file(file)
|
||||
return false if file == @source ||
|
||||
file.match(/^\./) ||
|
||||
file.match(/\/\./) ||
|
||||
(file.match(/\/\./) && !file.match(/\/\.htaccess/)) ||
|
||||
(file.match(/\/_/) && !file.match(/\/__/)) ||
|
||||
File.directory?(file)
|
||||
|
||||
|
|
Loading…
Reference in a new issue