Commit Graph

196 Commits

Author SHA1 Message Date
Aidan Feldman
716b8ede0e Loosen dependency on Shoulda
Fixes build for Ruby 2.1.0.
2014-01-03 05:44:47 -05:00
Matt Rogers
012387396a Merge pull request #1859 from robin850/rouge 2013-12-30 22:45:07 -06:00
Christoph Hochstrasser
dd919751ac Update kramdown to 1.3 2013-12-30 22:14:41 +01:00
Parker Moore
3744e70128 Raise restriction of safe_yaml to ~>1.0
Amends #1886
2013-12-28 13:47:35 -05:00
Ivan Tse
9d5683dc71 Bump safe_yaml version to include the fix for dtao/safe_yaml#35 2013-12-28 02:42:48 -05:00
Parker Moore
d2314d360a Bump mercenary to ~> 0.2.0 2013-12-26 14:34:28 -05:00
Robin Dupret
036cbda2f6 Require at least 1.3.0 for Rouge
Rouge 1.3.0 introduced a `rouge_formatter` helper which is handy to
overwrite the formatter default when using the Redcarpet plugin so let's
require this version at the very least.

An abort statement will be thrown when the installed version is not
correct.
2013-12-25 18:06:29 +01:00
Robin Dupret
0831d2b0f8 Add support for the Rouge syntax highlighter
By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.

The documentation has been updated accordingly.
2013-12-22 18:45:40 +01:00
Parker Moore
6195192bcf mojombo/jekyll ~> jekyll/jekyll 2013-12-11 17:44:33 -05:00
Parker Moore
1c22b3f751 Bump RedCarpet dependency to ~> 3.0 2013-12-11 16:51:57 -05:00
Matt Rogers
39b6fe732f Merge pull request #1780 from mojombo/kill-1-8 2013-12-11 06:08:10 -08:00
Matt Rogers
58159389b8 Merge pull request #1706 from mojombo/drop-commander 2013-12-10 21:16:42 -08:00
Parker Moore
585e074cda Update files list in gemspec.
Fixes #1793
2013-12-09 12:29:45 -05:00
Parker Moore
b58cd5c132 Merge pull request #1657 from mojombo/safe-whitelist
A gem-based plugin whitelist for `safe` mode
2013-12-07 21:41:55 -08:00
Matt Rogers
3788c08b13 prep the gemspec for 1.4.0 2013-12-07 17:59:21 -06:00
Matt Rogers
9f1593299a Merge pull request #1775 from Ivoz/maruku
Update to maruku 0.7
2013-12-06 20:56:52 -08:00
Parker Moore
96ecfb30ef Require Ruby version >= 1.9.2 in gemspec 2013-12-06 01:42:23 -05:00
Parker Moore
8d898dafde Add "jekyll_test_plugin_malicious" as gem dep 2013-12-06 00:22:07 -05:00
Parker Moore
aabb3e96cc Upgrade toml gem to 0.1.0 2013-12-05 18:08:32 -05:00
Matthew Iversen
0bdfed4b25 Update requirements to maruku 0.7 2013-12-05 11:59:36 +11:00
Parker Moore
51706e8da7 Parse TOML or YAML in Jekyll::Configuration. 2013-11-28 22:11:56 -05:00
Matt Rogers
4f337df2d8 Update the gemspec with the release post 2013-11-26 20:45:57 -06:00
Matt Rogers
91a4c5611e Prep for the 1.3.1 release 2013-11-26 20:27:27 -06:00
Parker Moore
b61534d260 Switch from commander to mercenary in gemspec 2013-11-20 22:51:24 -05:00
Matt Rogers
cc0c82f9d2 Prep for the 1.3.0 release 2013-11-03 21:46:02 -06:00
Matt Rogers
ace1e0fc01 Use the proper date in the gemspec 2013-10-30 07:44:11 -05:00
Parker Moore
a1fc0b18e8 Add Jekyll 1.3.0.rc1 Release Post to Gemspec 2013-10-29 12:31:02 -04:00
Matt Rogers
9f63ddb4db Prepare for a 1.3.0.rc release 2013-10-28 20:26:36 -05:00
Parker Moore
0c2d7c0864 Restrict mime-types gem to pre-2.0.
A coveralls dep has a '>=' dependency on mime-types.
2013-10-28 14:16:10 -04:00
Parker Moore
a0a9c5f676 Allow any versions of listen < 2.0 and >= 1.3 2013-10-28 14:04:37 -04:00
Matt Rogers
71d4319d5f Downgrade Listen to 1.3.x
This is so that we can be Ruby 1.8.x compatible.
2013-10-26 22:08:38 -05:00
Matt Rogers
2287eed0c6 Merge pull request #1589 from dchest/better-watch
Replace directory_watcher with listen.
2013-10-23 22:38:56 -05:00
Dmitry Chestnykh
12ba0a541c Update listen to ~> 2.0. 2013-10-18 11:04:54 +02:00
Parker Moore
694599645f Add in test plugin for inclusion. 2013-10-04 15:49:47 -04:00
Erik Michaels-Ober
cebb936e60 Update safe_yaml dependency to ~> 0.9.7 2013-10-04 19:52:55 +02:00
Parker Moore
68306c691a Merge pull request #1610 from sferik/update_kramdown_dependency
Update kramdown dependency to ~> 1.2
2013-10-04 09:30:41 -07:00
Parker Moore
6b2561424a Merge pull request #1603 from sferik/update_rake_dependency
Update rake dependency to ~> 10.1
2013-10-04 09:29:12 -07:00
Parker Moore
ddcb6e95f5 Merge pull request #1606 from sferik/update_coveralls_dependency
Update coveralls dependency to ~> 0.7.0
2013-10-04 09:28:30 -07:00
Parker Moore
82c8672632 Fix merge conflict. 2013-10-04 12:26:07 -04:00
Parker Moore
38d70938e9 Merge pull request #1604 from sferik/update_rr_dependency
Update rr dependency to version ~> 1.1
2013-10-04 09:23:04 -07:00
Erik Michaels-Ober
be36ca5e6a Update kramdown dependency to ~> 1.2 2013-10-04 12:04:56 +02:00
Erik Michaels-Ober
aea486819c Update launchy dependency to ~> 2.3 2013-10-04 12:01:37 +02:00
Erik Michaels-Ober
4b6f96903f Update cucumber dependency to ~> 1.3 2013-10-04 11:59:33 +02:00
Erik Michaels-Ober
ed17ef2b96 Update coveralls dependency to ~> 0.7.0 2013-10-04 11:57:41 +02:00
Erik Michaels-Ober
7bf7359d1b Update rr dependency to version ~> 1.1 2013-10-04 11:36:10 +02:00
Erik Michaels-Ober
d098a35d65 Update rake dependency to ~> 10.1 2013-10-04 11:29:07 +02:00
Parker Moore
422b75ae39 Downgrade to Maruku 0.6.0 to fix all the tests 2013-10-02 15:05:33 +00:00
liufengyun
760cbc7f91 Autoload yaml files under _data directory
The jekyll engine will autoload all yaml files(ends with .yml or .yaml)
under _data. If there's a file members.yml under the directory, then user
can access contents of the file through site.members.
2013-10-01 11:23:33 +08:00
Dmitry Chestnykh
8fe25a6958 Replace directory_watcher with listen.
Directory_watcher consumed ~25% CPU on big Jekyll projects (depending on
the number of watched files), since it polled for changes every second.

Listen is easier on CPU, as it uses directory change notifications
provided by OS (currently OS X and Linux), falling back to polling when
they are not available.
2013-09-30 04:33:04 +02:00
Matt Rogers
52a39db029 Merge pull request #1539 from maul-esel/coveralls
Add support for coveralls.io coverage reports
2013-09-16 18:28:28 -07:00