Commit Graph

2928 Commits

Author SHA1 Message Date
Arfon Smith f258e4940d Merge branch 'master' of github.com:github/linguist 2014-10-23 12:16:26 +01:00
Arfon Smith a7b8e38bf3 CI step for samples 2014-10-23 12:16:02 +01:00
Arfon Smith b65129a8e1 Merge pull request #1622 from pchaigno/shell-extensions
Add .command as a Shell file extension
2014-10-23 10:54:05 +01:00
Paul Chaignon b6a9993c97 Add .sc as a SuperCollider file extension 2014-10-22 10:16:30 -04:00
Josh Watzman 9c044c5bd0 Add detection for Hack files with ".php" file extension
Based on top of PR#1447. Adds a simple heuristic check for Hack files vs PHP files (`<?hh` vs other `<?`).

Tested by verifying that the Hack example site was detected as 100% Hack and that Laravel was detected as 100% PHP. (Without the heuristic, Laravel gets detected as about 50% Hack, just by randomness in the classifier since PHP and Hack are very hard to distinguish unless you actually parse the file and look for specific language features.)
2014-10-21 16:17:58 -07:00
Paul Chaignon 6b0783936f Add .command as a Shell file extension 2014-10-21 19:07:03 -04:00
Arfon Smith 2a66b754c2 CI config 2014-10-21 18:41:25 -04:00
Arfon Smith 460443b3c8 Merge branch 'master' of github.com:github/linguist 2014-10-21 18:40:53 -04:00
Arfon Smith cd99ab2d6e Vendored gems 2014-10-21 18:40:43 -04:00
Josh Watzman b2cb74cabf Add detection for Hack files with ".hh" file extension
Hack is Facebook's dialect of PHP: http://hacklang.org/. This adds support for detecting it via the ".hh" file extension; although that extension techincally conflicts with C++ headers, the files look different enough that the existing classifier based on sample code has no trouble distinguising them.

This diff deliberately does not deal with detecting ".php" as another valid extension for Hack code. That's much trickier since the code looks basically identical to PHP to the classifier, and needs a different approach.
2014-10-21 15:35:57 -07:00
Arfon Smith 6d07302963 Update cibuild 2014-10-21 16:49:13 -05:00
Arfon Smith d831205f6a Update cibuild 2014-10-21 16:41:55 -05:00
Arfon Smith a9b9e6216b Update cibuild 2014-10-21 16:10:05 -05:00
Arfon Smith 3ba090de7e Update cibuild 2014-10-21 16:07:49 -05:00
Arfon Smith c105208481 Update cibuild 2014-10-21 14:06:43 -05:00
Arfon Smith 0c9e14eeff Update cibuild 2014-10-21 14:06:13 -05:00
Arfon Smith 2a8a5cdca9 +x 2014-10-21 14:04:52 -05:00
Arfon Smith 1f91acbd9d Janky CI 2014-10-21 14:03:30 -05:00
Daniel Morris 6f8278aa79 Add build.xml.dist to XML filenames 2014-10-21 10:21:39 +01:00
Arfon Smith 3e48a84cf1 Merge pull request #1612 from briandela/patch-1
Add hbs alias for Handlebars
2014-10-20 10:29:04 -05:00
Arfon Smith 31728a3a78 Merge pull request #1613 from hearsilent/patch-1
Add .a51 to Assembly
2014-10-20 10:21:24 -05:00
Arfon Smith e56a2ed6ad Merge pull request #1614 from creasty/viml_underscore_vimrc
Add a filename rule for _vimrc
2014-10-19 16:45:42 -05:00
HearSilent 35aa57657b Add .a51 sample 2014-10-20 05:16:51 +08:00
Yuki Iwanaga 423c8865bd Add a filename rule for _vimrc 2014-10-20 00:39:26 +09:00
HearSilent 55ecc5f7eb Add .a51 to Assembly
.a51 doc is 8051-asm (coding in MIDE-51)
2014-10-19 17:32:41 +08:00
Brian Delahunty 6aae7882df Update indenentation 2014-10-18 18:03:27 -07:00
Brian Delahunty 240fcec3ce Add hbs alias for Handlebars
Adds a `hbs` alias for `Handlebars`. It's very commonly used and would make adding hbs code blocks easier in github comments.
2014-10-18 11:13:12 -07:00
Arfon Smith 170c1d4ee8 Merge pull request #1584 from laomaiweng/linguist-detect-tcl-shebang
Shebang detection for Tcl/Tk scripts
2014-10-17 14:32:13 -05:00
Arfon Smith 38f0a71ea3 Merge pull request #1596 from pchaigno/fcgi
Add .fcgi as an extension for script languages
2014-10-17 14:30:40 -05:00
Arfon Smith 62936dc6b5 Merge pull request #1609 from github/bundler-rakefile
Require "bundler/setup" in rakefile
2014-10-17 14:27:39 -05:00
Arfon Smith fb9c784f4f Merge pull request #1611 from github/rugged-gemspec
twiddle-wakka
2014-10-17 14:27:24 -05:00
Arfon Smith 89477ed2fa twiddle-wakka 2014-10-17 14:20:32 -05:00
Arfon Smith 844679dcbe Merge pull request #1610 from github/rugged-gemspec
Moving Rugged dependency back to gemspec
2014-10-17 14:07:47 -05:00
Brandon Keepers cd743332f4 Use yajl since it is already a dependency
Both JSON and Yajl were listed as dependencies. Pygments.rb already requires yajl, so let's just use that instead of using both.
2014-10-17 14:45:28 -04:00
Arfon Smith 47843e7e78 Moving Rugged dependency back to gemspec 2014-10-17 13:36:13 -05:00
Brandon Keepers 85957ecf56 Require "bundler/setup" in rakefile
This ensures that the Rake task will use bundler to manage dependencies and print a warning to run `bundle install` if dependencies are missing.
2014-10-17 14:14:27 -04:00
Arfon Smith 4232b04571 Merge pull request #1602 from github/gitattribute-docs
Docs update
2014-10-17 08:20:03 -05:00
Arfon Smith 34f717526a Merge pull request #1605 from github/bkeepers/gitattribute-docs
Suggested cuts for .gitattribute docs
2014-10-17 08:19:04 -05:00
Brandon Keepers b0b94182a2 ✂️ 2014-10-17 09:15:00 -04:00
Arfon Smith 843e196f00 Formatting 2014-10-16 20:56:21 -05:00
Arfon Smith 63661dfc6e Docs update 2014-10-16 16:33:49 -05:00
Arfon Smith f100dc91c2 Merge pull request #1588 from github/cache-bustin
Bust that cache
v3.4.0
2014-10-16 14:21:33 -05:00
Arfon Smith fd9d63d605 Removing beta label 2014-10-16 14:05:36 -05:00
Arfon Smith 5c21c35875 Merge branch 'master' into cache-bustin 2014-10-16 12:59:41 -05:00
Arfon Smith 370d55fd74 Merge pull request #1595 from github/text-html-ruby
Use TextMate 1 scope for HTML+ERB files
2014-10-15 17:05:08 -05:00
Paul Chaignon 0fcc26f778 Add .fcgi as an extension for script languages 2014-10-15 10:37:58 -04:00
Arfon Smith 8dd2ddcbf7 CI 2014-10-14 20:18:32 -05:00
Arfon Smith 037857623d Merge branch 'master' into cache-bustin
Conflicts:
	lib/linguist/version.rb
2014-10-14 19:45:09 -05:00
Arfon Smith d7b19d577b Bumping version 2014-10-14 19:44:35 -05:00
Adam Roben c70048a3e2 Use TextMate 1 scope for HTML+ERB files
The TextMate 2 scope requires support for injection grammars, which some parsers don't support.
2014-10-14 14:19:05 -04:00