Commit Graph

3387 Commits

Author SHA1 Message Date
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 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
Paul Chaignon 0fcc26f778 Add .fcgi as an extension for script languages 2014-10-15 10:37:58 -04: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
Arfon Smith 848a1cc1e5 Minor bump 2014-10-14 10:06:38 -05:00
Adam Roben 9092dfdc7f Add a TextMate scope for Literate CoffeeScript 2014-10-14 10:50:39 -04:00
Adam Roben d7fe0cc5c7 Add TextMate scopes for HTML variants 2014-10-14 10:41:19 -04:00
Adam Roben 15ec37d4bc Add a TextMate scope for Objective-C++ 2014-10-14 10:41:19 -04:00
Adam Roben 43cc701ac3 Add a TextMate scope for JSON 2014-10-14 10:41:19 -04:00
Adam Roben 7cb8357f73 Add a TextMate scope for YAML 2014-10-14 10:41:19 -04:00
Adam Roben 4b46bcf649 Add TextMate scopes for Sass/SCSS files 2014-10-14 10:41:19 -04:00
Arfon Smith afb6041104 Merge pull request #1592 from github/vmg/tmscopes
Vmg/tmscopes
2014-10-14 09:07:02 -05:00
Arfon Smith 4b28fdbc4d Removing beta label 2014-10-14 08:45:49 -05:00
Arfon Smith b8a5e8505a Merge branch 'vmg/tmscopes' into cache-bustin
Conflicts:
	lib/linguist/version.rb
2014-10-13 20:21:31 -05:00
Arfon Smith 3087d640a3 3.2.2b1 2014-10-13 19:33:03 -05:00
Arfon Smith e87b89ab5b Removing todo 2014-10-13 18:52:27 -05:00
Arfon Smith 5cc053694a Remove pry 2014-10-13 16:38:51 -05:00
Arfon Smith 653314448c Bust that cache 2014-10-13 16:37:46 -05:00
Arfon Smith 4f14db10ea Merge pull request #933 from pchaigno/pro
Support of the .pro file extension for Prolog.
2014-10-13 14:57:19 -05:00
Vicent Marti 9275e5240f Bump version 2014-10-13 17:50:57 +02:00
Vicent Marti 7dcc3b3edf Add tm_scope to the BlobHelper 2014-10-13 17:19:38 +02:00
Vicent Marti 6e872c11b6 Pass tm_scope overrides 2014-10-13 17:19:38 +02:00
Vicent Marti e5b6001759 Add support for TextMate scopes 2014-10-13 17:19:38 +02:00
Arfon Smith 5814b61356 Linguist v3.2.1 2014-10-13 09:47:02 -05:00
Arfon Smith bcb016a938 Removing beta label 2014-10-13 09:30:09 -05:00
Arfon Smith f7386fcd72 Rugged bump 2014-10-13 09:10:08 -05:00
Arfon Smith ffc0be191e Removing beta label 2014-10-13 08:42:46 -05:00
quentin eb54a92328 Add Tcl/Tk interpreters to languages.yml for shebang detection 2014-10-13 02:38:07 +02:00
Romain Lespinasse ce1e2441f4 Choose a color from the Golo logo 2014-10-11 10:27:06 +02:00
Arfon Smith c8cb7b7cab Git attr 2014-10-10 15:34:03 -05:00
Arfon Smith 332d97b57f Removing generated override for now. 2014-10-10 15:32:08 -05:00
Tomas Morstein 08290ac49e remove very rarely used .dcl extension for now
...to avoid collision with Clean language as well
as the .dcl extension can be seen only in some special
cases -- especially in context of DCL emulation tools
for non-OpenVMS systems (probably to avoid potential
confusion with MS-DOS .com files).
2014-10-04 22:46:32 +02:00
Tomas Morstein 42944660bd no need to group DCL and MMS/MMK 2014-10-04 22:02:27 +02:00
Tomas Morstein ae5e1c5a85 DCL & MMS lexers are not supported, use Text only 2014-10-04 21:43:20 +02:00
Tomas Morstein ab3f44cb6e add DECset Module Management System support 2014-10-04 20:38:46 +02:00
Tomas Morstein 8bb9241e6e add DIGITAL Command Language (DCL) 2014-10-04 19:08:57 +02:00
Arfon Smith 03bb48cf28 Version bump 2014-09-30 08:42:08 -05:00
Arfon Smith e71eefe8fc Merge branch 'master' into 1515-local 2014-09-30 08:38:26 -05:00
Arfon Smith 09323c8bbc Version bump 2014-09-29 15:28:00 -05:00
Brandon Keepers 2b411aad90 Extract #read_index for tests 2014-09-29 15:04:48 -04:00
Brandon Keepers 1c6483a499 Simplify boolean attribute handling 2014-09-29 14:13:44 -04:00
Brandon Keepers 6edf4498ce Move overridden_language to just #language 2014-09-29 14:12:36 -04:00
Brandon Keepers b160a39678 Remove linguist_* prefix from vendored? and generated? 2014-09-29 13:48:40 -04:00
Lars Brinkhoff 86b4de89bd Only Forth uses .frt. 2014-09-27 06:10:19 +02:00
Paul Chaignon 8012876d5e Support for Graph Modeling Language 2014-09-26 10:43:35 -04:00
Arfon Smith 2e3e8c5b89 Removing pry 2014-09-25 13:55:14 -05:00
Arfon Smith 5284608942 Stubbing git attributes (for now) 2014-09-25 13:48:03 -05:00