github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-02-16 09:37:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,697 Commits 60 Branches 160 Tags
d41e5e1fc035ebdf21b9f5ba679c4df875a64dbe
Commit Graph

1091 Commits

Author SHA1 Message Date
Parker Moore
fdbfd719ca Add CoffeeScript converter. 2014-01-25 20:38:51 -05:00
Matt Rogers
5b7a53b543 Merge pull request #1932 from jekyll/sass 2014-01-24 15:18:06 -08:00
Parker Moore
774bf96c61 Merge master into sass 2014-01-24 12:17:35 -05:00
Dan Tao
fafacef0a0 added a test that YAML.load doesn't get clobbered 
I THINK this is a good idea? I considered multiple approaches to testing this;
what I like about this dumb way (just try to deserialize a symbol) is that it's
nice and simple.
 2014-01-23 17:42:14 -08:00
Dan Tao
4f0b1bdf6d switched from YAML.safe_load* to SafeYAML.load* 2014-01-23 17:25:17 -08:00
Matt Rogers
98857832cd Merge pull request #1931 from liufengyun/published 2014-01-22 05:38:04 -08:00
liufengyun
22e1e5f28c make sure pages with published being false are not generated 2014-01-19 09:52:19 +08:00
Jens Nazarenus
82bee23bd0 added tests for full path leak to source directory when using include tag 2014-01-16 18:43:25 +01:00
Matt Rogers
10e5ecfe53 Improve the test description for the outputs_ext test 2014-01-15 23:04:52 -06:00
Matt Rogers
824d9f6ca8 Better express that the converter always outputs css 2014-01-15 22:49:33 -06:00
Ben Balter
e3be74e376 sanity check for pages permalink traversal 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Andy Lindeman
a8dd34420b Prevents disclosure of file existence 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
c84cb5c007 escape relative post permalinks, cleanup 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
a799e41b70 patch symlink vuln and properly test 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
4e318cd192 test symlinkd dir, not file 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
ce425eec8b fix symlink so tests fail 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
f570a9339d unbreak tests 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
dfec551cc4 add symlink failing test 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
0acbe95797 test multiple traversals 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
f49ee21136 fix failing post count test 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
9b3068c15d url escape before sanitizing 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
9e796d0627 failing test 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Parker Moore
2966606b1a Add docs about the 'new' restriction on excludes. 2014-01-13 00:17:12 -08:00
Parker Moore
4afe39e461 Allow caching in unsafe mode, but disable in safe mode. 2014-01-12 21:36:08 -08:00
Parker Moore
ecf85a9cfa Does not allow caching. 
This was done to prevent putting the .sass-cache folder in bad places. Needed? cc @benbalter.
 2014-01-12 21:30:30 -08:00
Parker Moore
8ecd2d9218 Don't allow path traversal or syntax overrides. 2014-01-12 21:30:30 -08:00
Parker Moore
4784d1de18 Build Sass configuration options. 2014-01-12 21:30:30 -08:00
Parker Moore
22d4e2aa90 Consolidate into one master 'Sass' converter. 2014-01-12 21:30:29 -08:00
Parker Moore
4da7223831 Fixes for Sass/SCSS converters. 2014-01-12 21:30:29 -08:00
Parker Moore
331c7adc08 Move #glob_include? from core_ext to entry_filter 2014-01-08 20:24:21 -08:00
Parker Moore
366f9268ee Add tests for new exclude behaviour. 2014-01-05 11:01:51 -08:00
Parker Moore
a5f1bc0341 Fixed the tests... I guess Hash literals aren't ok. 2014-01-03 21:23:02 -08:00
Parker Moore
b4383a5c42 Flesh out tests for where filter for @mattr- 😃 2014-01-03 21:23:02 -08:00
Ben Balter
39e4d6b3ba add where filter to filter arrays of objects 2014-01-03 21:23:02 -08:00
Parker Moore
c7b649f792 Update test_generated_site.rb to know about new post 2014-01-01 19:53:42 -08:00
Matt Rogers
012387396a Merge pull request #1859 from robin850/rouge 2013-12-30 22:45:07 -06:00
Matt Rogers
a2fd8ba7c3 Merge pull request #1849 from afeld/sort-attributes 2013-12-30 20:31:45 -08:00
Meeka
1da8f04aaa Removes assert_includes to pass Travis 2013-12-30 12:57:23 -05:00
Meeka
9652b7ef80 adds to_s method testing on Excerpt 2013-12-30 12:23:41 -05:00
Meeka
3a0733deb9 Adds tests for the Excerpt include?, id, and inspect methods 2013-12-30 12:15:13 -05:00
Parker Moore
791c6d815d Merge pull request #1825 from arika/smallfix_post_url_tag_behavior_for_invalid_names 2013-12-25 22:32:50 -08:00
Parker Moore
6e8f31f406 Merge pull request #1841 from jens-na/include-variable-liquid-filters 2013-12-25 22:11:33 -08:00
Parker Moore
c70350e275 Merge branch 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll into gjtorikian-steal-envygeeks-custom-markdown-processors 
* 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll:
  Depend on Jekyll.logger.error, not $stderr
  Allow custom Markdown processors.
  New is implied by `raise`, 2nd is the message.
  Use $stderr, not STDERR, $stderr points to STDERR.
 2013-12-25 23:52:50 -05:00
Jordon
c759a7a75f Allow custom Markdown processors. 2013-12-25 19:36:25 -06:00
Aidan Feldman
9d7c524530 fix file sorting test 2013-12-22 19:33:00 -05:00
Aidan Feldman
fa8618879d Merge remote-tracking branch 'upstream/master' into sort-attributes 2013-12-22 19:31:56 -05:00
Robin Dupret
4bf716c2ad Set highlighter to pygments when upgrading 
In case you are upgrading from 1.4.2 to 2.0 and the pygments option is
set to true, then the highlighter option will be set to pygments
automatically.
 2013-12-22 18:45:46 +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
Robin Dupret
92064134d6 Rename the pygments option to highlighter 
Rename the pygments configuration option to highlighter to allow
different highlighters in the future. For now, the allowed values are
`pygments` and `null`.

It's now more straightforward to plug another syntax highlighter.
 2013-12-22 12:45:15 +01:00
Aidan Feldman
2bfafb3b33 make non-data properties/methods accessible to Liquid 
per https://github.com/jekyll/jekyll/pull/1849/files#r8490593
 2013-12-22 03:38:32 -05:00