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

Merge branch 'master' of github.com:middleman/middleman

Browse source
This commit is contained in:
Thomas Reynolds 2013-07-02 14:42:54 -07:00
parent 6403daccd3 ab98f4bcc0
commit dd2525c18e
3 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
middleman-core/features/directory_index.feature
View file

@ -12,6 +12,7 @@ Feature: Directory Index
| regular/index.html | | regular/index.html |
| .htaccess | | .htaccess |
| .htpasswd | | .htpasswd |
| .nojekyll |
Then the following files should not exist: Then the following files should not exist:
| egular/index/index.html | | egular/index/index.html |
| needs_index.html | | needs_index.html |

0
middleman-core/fixtures/indexable-app/source/.nojekyll Normal file
View file

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

@ -33,7 +33,7 @@ module Middleman
# Files starting with an dot, but not .htaccess # Files starting with an dot, but not .htaccess
:source_dotfiles => proc { |file| :source_dotfiles => proc { |file|
file =~ %r{/\.} && file !~ %r{/\.ht(access|passwd)} file =~ %r{/\.} && file !~ %r{/\.(htaccess|htpasswd|nojekyll)}
}, },
# Files starting with an underscore, but not a double-underscore # Files starting with an underscore, but not a double-underscore