Adam Roben
1f1ffcbfa6
Merge pull request #1930 from github/minitest
...
Switch to Minitest::Test instead of Test::Unit::TestCase
2015-01-02 16:27:43 -05:00
Adam Roben
065dd713c1
Assert that generated files are detected correctly
2015-01-02 16:15:55 -05:00
Arfon Smith
71132d48ff
Merge pull request #1922 from Mailaender/patch-2
...
Added support for Mono .dll.config XML files
2015-01-02 11:10:46 -06:00
Matthias Mailänder
d77e0c62c1
add a DllMap example file
...
www.mono-project.com/docs/advanced/pinvoke/dllmap/#example
2015-01-02 17:28:37 +01:00
Matthias Mailänder
e853c36039
Update languages.yml
...
add support for Mono .dll.config XML files
2015-01-02 17:28:36 +01:00
Brandon Keepers
2be3220824
Merge pull request #1940 from github/fix-multiple-extensions
...
Fix for extensions with multiple segments
2015-01-02 10:59:30 -05:00
Lars Brinkhoff
6ae39e50ae
Fix #1731 to allow samples with multiple file extension segments.
2015-01-02 10:41:22 -05:00
Arfon Smith
c783acc973
Merge pull request #1937 from github/hack-highlighting
...
Update languages.yml for Hack syntax-highlighting
2015-01-02 07:38:24 -06:00
Arfon Smith
e5210b5137
Update languages.yml
2015-01-02 06:53:58 -06:00
Arfon Smith
41f0950c04
Merge pull request #1933 from floscher/patch-1
...
Added CartoCSS to languages.yml
2015-01-01 13:46:22 -06:00
Florian Schäfer
9f439cd7fb
Added support for CartoCSS
...
Code sample was taken from https://github.com/gravitystorm
/openstreetmap-carto/blob/ae990905790a26ae8af107441ce9e85b60ea1266
/amenity-points.mss
2015-01-01 17:15:22 +01:00
Arfon Smith
c911c5c045
Merge pull request #1932 from deadfoxygrandpa/elm
...
Update Elm support by adding its own syntax highlighting
2015-01-01 09:16:29 -06:00
Alex Neslusan
27a7873e08
Add color to Elm language definition
2015-01-01 20:41:05 +08:00
Alex Neslusan
5fe233384e
Update Elm support
2015-01-01 20:24:13 +08:00
Adam Roben
65296e86a3
Switch to Minitest::Test instead of Test::Unit::TestCase
...
This gives us a consistent test framework across all Ruby versions which
should help avoid errors that are only found when CI runs the tests on
different Rubies. (And this fixes an immediate bug where there's no
`skip` method in the version of test-unit we're currently using only on
Ruby 2.2.)
2014-12-31 15:26:26 -05:00
Adam Roben
c9b7bb73b9
Use test/helper.rb in test_file_blob.rb
2014-12-31 15:19:56 -05:00
Adam Roben
795f42cbaa
Merge pull request #1832 from pchaigno/optimize-generated
...
Optimization of generated?
2014-12-31 15:19:43 -05:00
Arfon Smith
d540ec0cb8
Merge pull request #1928 from github/contributing-update
...
Update including explicit steps to resolve conflicts.
2014-12-31 11:38:48 -06:00
Arfon Smith
202cba1a14
Update CONTRIBUTING.md
2014-12-31 11:38:03 -06:00
Arfon Smith
20d5b81085
Merge pull request #1929 from github/1304-local
...
Take 2: Add support for .sls YAML files (SaltStack states)
2014-12-31 09:45:14 -06:00
Arfon Smith
d8b806592d
Removing trailing slash
2014-12-31 08:27:40 -06:00
Arfon Smith
84f9b83fc2
Fixing up grammars
2014-12-31 08:25:56 -06:00
Arfon Smith
7cb5106656
Adding atom-salt gitsubmodule
2014-12-31 07:48:48 -06:00
Arfon Smith
6f21df7624
Merge branch 'master' into 1304-local
...
Conflicts:
grammars.yml
2014-12-30 22:15:55 -06:00
Arfon Smith
4c7dc565e7
Update including explicit steps to resolve conflicts.
2014-12-30 20:52:48 -06:00
Adam Roben
3c60fba430
Merge pull request #1926 from github/sas-grammar
...
Added support for SAS syntax.
2014-12-30 07:26:32 -05:00
Roy Pardee
224eef9ffa
Added support for SAS syntax.
2014-12-30 06:34:37 -05:00
Paul Chaignon
42beadcf34
Use an exception for tests on Generated.generated?
2014-12-28 17:00:13 +01:00
Brandon Keepers
80ed2d6d30
Merge pull request #1920 from pchaigno/webidl-grammar
...
Grammar for WebIDL
2014-12-27 14:55:47 -05:00
Paul Chaignon
c2bf6fe7f5
Grammar for WebIDL
2014-12-27 16:54:41 +01:00
Adam Roben
6f014f8638
Merge pull request #1896 from github/grammar-submodules
...
Move all grammars that use Git repos to submodules
2014-12-22 17:17:40 -05:00
Adam Roben
66ca5aca89
Init submodules in CI
2014-12-22 17:07:37 -05:00
Adam Roben
33afa30c30
Don't use question marks in struct fields
...
Apparently it doesn't work in Ruby 1.9.
2014-12-22 17:06:49 -05:00
Adam Roben
1634d787ec
Use fast-submodule-update in CI
...
Hopefully this will speed up CI builds.
2014-12-22 16:58:59 -05:00
Adam Roben
df7b529e23
Set tracking branches for submodules that aren't tracking master
...
This will let us use `git submodule update --remote` to update the
submodules to the latest commit from the relevant branch.
2014-12-22 16:41:22 -05:00
Adam Roben
56d90bedd0
Sort grammars.yml
2014-12-22 16:36:35 -05:00
Brandon Keepers
8369d253f8
Move grammar sources to vendor/grammars
2014-12-22 16:28:58 -05:00
Adam Roben
516d3e226c
Suggest adding/removing submodules from the repo
2014-12-22 15:50:33 -05:00
Adam Roben
47b785a8fd
Initialize submodules before updating them
...
Initialization cannot happen in parallel because every submodule has to
get written to .git/config.
2014-12-19 16:05:17 -05:00
Adam Roben
6a2bf3fd2f
Update submodules in parallel to speed up bootstrap
...
This runs 8 `git submodule update` processes in parallel, speeding up
bootstrap from 2 minutes to 30 seconds for me. (Obviously this is
dependent on bandwidth.)
2014-12-19 16:05:17 -05:00
Adam Roben
ff678642e6
Suggest running script/bootstrap before building gems
...
This ensures all our submodules are up to date as well.
2014-12-19 16:05:17 -05:00
Adam Roben
e3eb1b90c5
Test that grammars.yml agrees with the list of submodules
...
If any submodules are missing from grammars.yml, or are listed in
grammars.yml but missing from the repo, the test will fail.
Eventually it would be good to test that the scopes for each submodule
are accurate, but that will take some more work.
2014-12-19 16:05:17 -05:00
Adam Roben
49125f077c
Update grammars.yml
...
This is just the result of running script/download-grammars.
2014-12-19 15:39:02 -05:00
Adam Roben
324031cb68
Sort grammars.yml
2014-12-19 15:39:02 -05:00
Adam Roben
f2ab426d38
Move all grammars that use Git repos to submodules
...
This makes it so we don't have to redownload all the grammars every time
we build the grammars gem. It will also let us verify that grammars.yml
is accurate in the future by checking it against the submodules on disk.
script/bootstrap now updates the submodules.
2014-12-19 15:39:02 -05:00
Brandon Keepers
587ab35d65
Merge pull request #1904 from github/remove-cached-gems
...
Remove cached gems
2014-12-19 11:27:10 -05:00
Brandon Keepers
16a6dda3dd
Remove cached gems
2014-12-19 10:52:29 -05:00
Arfon Smith
15191b068d
Merge pull request #1890 from github/cut-release-v4.2.4
...
Updating Linguist version for v4.2.4
2014-12-18 14:31:21 -08:00
Arfon Smith
ee9cc24e52
Longer timeout
2014-12-18 14:28:33 -08:00
Arfon Smith
0584fbf42b
4.2.5
2014-12-18 14:17:36 -08:00
