From 0d4dd71ae2fadee9a44c3197f41fc8a388848a55 Mon Sep 17 00:00:00 2001 From: Arron Mabrey Date: Sun, 30 Jun 2013 18:44:34 -0400 Subject: [PATCH 1/3] Add .nojekyll file to indexable-app fixture --- middleman-core/fixtures/indexable-app/source/.nojekyll | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 middleman-core/fixtures/indexable-app/source/.nojekyll diff --git a/middleman-core/fixtures/indexable-app/source/.nojekyll b/middleman-core/fixtures/indexable-app/source/.nojekyll new file mode 100644 index 00000000..e69de29b From 00d6a788721bf89a96ced45acd746abb00df418d Mon Sep 17 00:00:00 2001 From: Arron Mabrey Date: Sun, 30 Jun 2013 18:45:49 -0400 Subject: [PATCH 2/3] Add expectation that .nojekyll file should exist to directory_index feature --- middleman-core/features/directory_index.feature | 1 + 1 file changed, 1 insertion(+) diff --git a/middleman-core/features/directory_index.feature b/middleman-core/features/directory_index.feature index 556e1d8b..6dac65e1 100644 --- a/middleman-core/features/directory_index.feature +++ b/middleman-core/features/directory_index.feature @@ -12,6 +12,7 @@ Feature: Directory Index | regular/index.html | | .htaccess | | .htpasswd | + | .nojekyll | Then the following files should not exist: | egular/index/index.html | | needs_index.html | From 44e5ff3f6ce7c050dfa9f59f98552b0b13d88090 Mon Sep 17 00:00:00 2001 From: Arron Mabrey Date: Sun, 30 Jun 2013 18:46:39 -0400 Subject: [PATCH 3/3] Update Sitemap source_dotfiles to support .nojekyll file --- middleman-core/lib/middleman-core/sitemap.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/sitemap.rb b/middleman-core/lib/middleman-core/sitemap.rb index bd786731..bd4a79c6 100644 --- a/middleman-core/lib/middleman-core/sitemap.rb +++ b/middleman-core/lib/middleman-core/sitemap.rb @@ -33,7 +33,7 @@ module Middleman # Files starting with an dot, but not .htaccess :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