Merge pull request #1360 from github/1358-local

1358 local
github-linguist · Jul 7, 2014 · 408a325 · 408a325
2 parents 94b4ad1 + 5ca211b
commit 408a325
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml
@@ -40,6 +40,9 @@
 - foundation.min.css
 - foundation.css
 
+# Normalize.css
+- normalize.css
+
 # Vendored dependencies
 - thirdparty/
 - vendors?/

diff --git a/test/test_blob.rb b/test/test_blob.rb
@@ -277,7 +277,7 @@ def test_vendored
 
     # 'thirdparty' directory
     assert blob("thirdparty/lib/main.c").vendored?
-    
+
     # 'extern(al)' directory
     assert blob("extern/util/__init__.py").vendored?
     assert blob("external/jquery.min.js").vendored?
@@ -385,7 +385,10 @@ def test_vendored
 
     # NuGet Packages
     assert blob("packages/Modernizr.2.0.6/Content/Scripts/modernizr-2.0.6-development-only.js").vendored?
-
+
+    # Normalize
+    assert blob("some/asset/path/normalize.css").vendored?
+
     # Cocoapods
     assert blob('Pods/blah').vendored?