Commit Graph

512 Commits

Author SHA1 Message Date
Arfon Smith 037857623d Merge branch 'master' into cache-bustin
Conflicts:
	lib/linguist/version.rb
2014-10-14 19:45:09 -05:00
Arfon Smith 7aabc6a5ad A different approach 2014-10-13 17:01:53 -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
Arfon Smith 332d97b57f Removing generated override for now. 2014-10-10 15:32:08 -05:00
Arfon Smith e71eefe8fc Merge branch 'master' into 1515-local 2014-09-30 08:38:26 -05:00
Arfon Smith 77126e9e17 Removing fixture file 2014-09-29 16:28:23 -05:00
Arfon Smith d1d5c61df5 Updating ref for gitattribute testing 2014-09-29 16:27:20 -05:00
Arfon Smith 0cd7d85ec4 Using .gitattributes from test branch 2014-09-29 15:10:01 -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 b160a39678 Remove linguist_* prefix from vendored? and generated? 2014-09-29 13:48:40 -04:00
Arfon Smith 5284608942 Stubbing git attributes (for now) 2014-09-25 13:48:03 -05:00
Arfon Smith 3ff1e38f6c Adding support for overriding configurations in vendor.yml and generated? 2014-09-25 12:50:42 -05:00
Arfon Smith b533b682d5 Test files for .gitattributes 2014-09-25 12:13:55 -05:00
Paul Chaignon f59cf24a82 Merge branch 'master' into pro 2014-09-25 10:23:21 -04:00
Arfon Smith f87436d499 Adding linguist_vendored? and linguist_generated? to include overrides from .gitattributes 2014-09-24 19:57:30 -05:00
Arfon Smith 5152bd7124 Merge pull request #1547 from bwestlin/master
Added files generated by Typesafe Activator to vendor.yml
2014-09-24 17:04:16 -05:00
Keith Rarick 86aa4c3f3d Add Go dependencies to generated.rb and test_blob.rb 2014-09-22 01:12:46 -07:00
Keith Rarick 19b8721225 Add Go dependencies to vendor.yml and test_blob.rb 2014-09-22 00:58:56 -07:00
Björn Westlin c7c4883f49 Added files generated by Typesafe Activator to vendor.yml 2014-09-21 22:08:12 +02:00
Brandon Keepers 015af19eaf Move Samples::DATA constant to Samples.cache method 2014-09-16 10:25:30 -04:00
Arfon Smith 0e86ab9044 Version beta bump and some notes 2014-09-11 15:05:36 -05:00
Vicent Marti 3d39e842ec Load Git Attributes for Linguist-specific overrides 2014-09-11 13:51:07 +02:00
Arfon Smith f97e103b6d Merge branch 'master' into 1444-local 2014-09-04 11:51:06 -05:00
Paul Chaignon e76837fa20 Change lexer for Emacs Lisp from Scheme to Common Lisp 2014-09-02 10:33:53 -04:00
Arfon Smith e27bf1627d Merge pull request #1445 from cflee/add-foundation-js
Add Foundation js to vendor.yml, and test_blob.rb
2014-08-14 13:16:41 -05:00
Arfon Smith a6efeebd21 Merge pull request #1421 from stevex86/master
Adding Font Awesome to vendored files.
2014-08-14 12:10:10 -05:00
Arfon Smith 54318f4001 Merge branch 'master' into 1348-local
Conflicts:
	lib/linguist/samples.json
2014-08-13 15:26:49 -07:00
Thomas Van Doren e03b3e5ec4 Merge branch 'master' of github.com:github/linguist into chapel-lang
Conflicts:
	lib/linguist/samples.json
2014-08-12 11:10:55 -05:00
Arfon Smith 43923976c2 Adding test to check that languages.yml includes all extensions represented in samples folder 2014-08-11 14:16:25 -07:00
Chiang Fong Lee b8e570bb3d Add Foundation js to vendor.yml, and test_blob.rb
Excludes files like:
- foundation.js
- foundation.min.js
- foundation.abide.js
2014-08-06 20:07:08 +08:00
Builder's Brewery 69ff3c79b4 removed find_by_alias('lsl') test 2014-08-06 13:04:31 +02:00
Builder's Brewery 473688b109 Added tests for LSL to 'test/test_language.rb' 2014-08-06 12:47:56 +02:00
Steve King, Jr fc73f51855 Adding Font Awesome to vendored files. 2014-07-28 10:37:18 -07:00
Arfon Smith 9f0f4657a2 Fixing broken test 2014-07-15 16:13:46 -07:00
Arfon Smith 60144c907e Modifying Mirah search terms 2014-07-15 11:01:41 -07:00
Thomas Van Doren ad4d273241 Merge remote-tracking branch 'github/master' into chapel-lang
Conflicts:
	lib/linguist/samples.json
2014-07-10 14:57:26 -07:00
Arfon Smith 17a28f2e91 Merge branch 'master' into 1285-local
Conflicts:
	lib/linguist/language.rb
	lib/linguist/samples.json
2014-07-09 12:46:18 -05:00
Arfon Smith cfeb2a833c Checking all files for binary? 2014-07-09 12:11:25 -05:00
Arfon Smith 5ca211b9f7 Adding test for Normalize.css 2014-07-07 15:34:10 -05:00
Thomas Van Doren bb7d6ab429 Merge remote-tracking branch 'github/master' into chapel-lang
Conflicts:
	lib/linguist/samples.json
2014-07-05 11:52:58 -07:00
Arfon Smith 94b4ad1de6 Merge pull request #1353 from github/1217-local
1217 local
2014-07-04 18:49:34 -05:00
Arfon Smith 3e2f18bf3f Testing Pods 2014-07-04 18:45:43 -05:00
Thomas Van Doren c5acce0604 Include Chapel in some of the language tests. 2014-07-03 15:31:52 -07:00
Vicent Marti d206131df0 Hardcode OIDs for test 2014-06-27 13:51:37 +02:00
Vicent Marti 12429b90fe Bring back missing test 2014-06-26 21:24:30 +02:00
Vicent Marti 659d27cae5 DOCS 2014-06-26 12:54:08 +02:00
Vicent Marti 1fd59361b5 Proper incremental diffing 2014-06-25 20:26:44 +02:00
Vicent Marti c4260ae681 Use Rugged when computing Repository stats 2014-06-24 17:41:16 +02:00