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
Brandon Keepers
a35d9a8d29
Merge pull request #1561 from pchaigno/graph-ml
...
Support for Graph Modeling Language
2014-09-26 14:34:39 -07: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
Arfon Smith
ea2c7d8b27
Testing
2014-09-25 13:11:43 -05:00
Arfon Smith
b0db064d09
Updating .gitattributes for real usage
2014-09-25 12:57:21 -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
178d4756ef
Changing up .gitattributes keys for testing
2014-09-24 19:25:05 -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
Arfon Smith
b5015b6cc7
Merge pull request #1554 from github/1267-local
...
1267 local
2014-09-24 16:50:55 -05:00
Arfon Smith
097900a327
Merge pull request #1553 from github/1372-local
...
1372 local
2014-09-24 16:45:39 -05:00
Arfon Smith
1d2a6c38c7
Merge branch 'master' into 1267-local
...
Conflicts:
lib/linguist/samples.json
2014-09-24 16:43:42 -05:00
Arfon Smith
cc87ceb0d5
Merge branch 'master' into 1372-local
...
Conflicts:
lib/linguist/samples.json
2014-09-24 16:38:07 -05:00
Arfon Smith
a38f77683b
Merge pull request #1552 from github/benchmarking
...
Benchmarking
2014-09-24 16:13:53 -05:00
Arfon Smith
d8da05cde2
Merge pull request #1522 from github/cl-heuristics
...
Heuristics on for .cl
2014-09-24 10:58:40 -05:00
Arfon Smith
554b5bfe7f
Merge pull request #1549 from kr/godep
...
Treat Go dependency tree as generated and vendored code
2014-09-24 10:56:41 -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
Arfon Smith
0cb1ebc41e
Merge pull request #1546 from vivekgalatage/master
...
Adding JavaScript syntax support for JavaScriptBuild (.jsb) files
2014-09-21 21:44:03 -05:00
Björn Westlin
c7c4883f49
Added files generated by Typesafe Activator to vendor.yml
2014-09-21 22:08:12 +02:00
Vivek Galatage
d8b4d4639c
Sample JSBuild file showing the usage javascript as scripting language.
2014-09-22 00:15:35 +05:30
Vivek Galatage
ebe45e6f37
Adding JavaScript syntax support for JavaScriptBuild (.jsb) files
...
jsb is a meta build system [1] which can generate actual build files for GNU make, ninja, visual studio etc.
These files are pure javascript files. Just to differentiate them from rest of the javascript files, these are marked as .jsb file.
[1] https://github.com/vivekgalatage/jsb
2014-09-21 10:27:54 +05:30
Arfon Smith
cb016f8439
Merge pull request #1545 from larsbrinkhoff/groff
...
Add Groff sample.
2014-09-20 13:58:18 -05:00
Lars Brinkhoff
92212d2652
Add Groff sample.
2014-09-19 13:51:19 +02:00
Arfon Smith
950882be78
Merge pull request #1537 from github/drop-samples.json
...
Ignore samples.json
2014-09-18 14:30:15 -05:00
Arfon Smith
036855072e
Merge branch 'master' into drop-samples.json
...
Conflicts:
.travis.yml
2014-09-18 14:29:54 -05:00
Arfon Smith
29bbf50900
Merge pull request #1542 from github/travis-updates
...
Cleaning up travis.yml
2014-09-18 14:26:23 -05:00
Arfon Smith
ca59303dba
Preferred syntax
2014-09-18 14:25:36 -05:00
Arfon Smith
e21f35039b
Is this still needed?
2014-09-18 14:11:08 -05:00
Arfon Smith
f2b377fae8
Removing unnecessary Travis build step
2014-09-18 14:07:14 -05:00
Arfon Smith
24a36bf4bb
Removing docs about generating samples
2014-09-18 14:06:11 -05:00
Arfon Smith
3284450dc4
Make sure samples.json is present before running tests
2014-09-18 13:56:41 -05:00
Arfon Smith
ea9d326819
Merge branch 'master' into drop-samples.json
2014-09-18 13:50:53 -05:00
Arfon Smith
4cc679c1e5
Merge branch 'master' into 1515-local
2014-09-17 09:54:45 -05:00
Arfon Smith
c49ce55714
Bumping Rugged
2014-09-17 09:54:41 -05:00
The rugged tests are fragile
9d4b5416a5
Bump Rugged
2014-09-17 15:48:14 +02:00
Arfon Smith
82285df54b
Merge pull request #1536 from pchaigno/apex-lexer
...
Use Java lexer for Apex
2014-09-16 16:46:50 -05:00
Brandon Keepers
e67c1789b8
Generate samples.json before building gem
2014-09-16 10:26:35 -04:00
Brandon Keepers
015af19eaf
Move Samples::DATA constant to Samples.cache method
2014-09-16 10:25:30 -04:00
Brandon Keepers
156985ed52
Remove samples.json from version control
2014-09-16 10:24:05 -04:00
Paul Chaignon
71d1bd75c0
Use Java lexer for Apex
2014-09-15 16:10:36 -04:00
Arfon Smith
8e7c9c4bc4
Merge pull request #1524 from ankitr/patch-1
...
Changes C# to proposed color in #1332
2014-09-15 14:07:46 -05:00
Arfon Smith
7b7236fe30
Merge pull request #1534 from github/1530-local
...
1530 local
2014-09-15 14:00:49 -05:00
Arfon Smith
55d997f43a
Merge branch 'master' into 1530-local
...
Conflicts:
lib/linguist/samples.json
2014-09-15 13:48:22 -05:00