Commit Graph

7272 Commits

Author SHA1 Message Date
Pierre Fenoll 4aadfe9fd7 Add test that filters out symlink pointing outside site source 2016-03-26 14:16:43 +01:00
Pierre Fenoll bbd2a2b7f1 Rename EntryFilter#bad_symlink? to EntryFilter#symlink_outside_site_source? 2016-03-26 13:12:08 +01:00
Parker Moore 33255e3ac3
IncludeTag: implement multiple load paths 2016-03-25 17:44:29 -07:00
Parker Moore 0920d2b48a
LayoutReader#read: read in Theme layouts if they aren't already registered 2016-03-25 17:06:26 -07:00
Parker Moore a30068bf3f
Merge remote-tracking branch 'origin/master' into themes
* origin/master: (65 commits)
  Update history to reflect merge of #4703 [ci skip]
  Update history to reflect merge of #4712 [ci skip]
  Highlight the test code
  Update history to reflect merge of #4640 [ci skip]
  readded "env=prod"-condition
  Update history to reflect merge of #3849 [ci skip]
  Update history to reflect merge of #4624 [ci skip]
  Update history to reflect merge of #4704 [ci skip]
  Update history to reflect merge of #4706 [ci skip]
  Checks for link file extension in tests
  Updating assets documentation
  Fix test teardown for cleaner.
  Update history to reflect merge of #4542 [ci skip]
  Add explanation of site variables in the example _config.yml
  Use double quotes in the gemfile
  Add test for creation of Gemfile by 'jekyll new'
  Add comment about github-pages
  Update history to reflect merge of #4533 [ci skip]
  Ensure Rouge closes its div/figure properly after highlighting ends.
  Add Site#config= which can be used to set the config
  ...
2016-03-25 16:30:25 -07:00
Parker Moore a1a4b3937a
Add Layout#relative_path so the layout can tell us what its path is for error messages 2016-03-25 16:29:37 -07:00
jekyllbot f2aa15555b Update history to reflect merge of #4703 [ci skip] 2016-03-25 16:27:39 -07:00
jekyllbot afa89d68f8 Merge pull request #4703 from jekyll/after_init_hook
Merge pull request 4703
2016-03-25 16:27:38 -07:00
Parker Moore 6aae64c985 Update test_theme.rb 2016-03-25 15:22:29 -07:00
jekyllbot 9474c370dc Update history to reflect merge of #4712 [ci skip] 2016-03-25 15:11:42 -07:00
jekyllbot a04df2f440 Merge pull request #4712 from chrisfinazzo/highlight-code-samples
Merge pull request 4712
2016-03-25 15:11:41 -07:00
Florian Thomas d213981a24 Fix warnings
This removes the following warnings:

- /lib/jekyll/configuration.rb:151: warning: instance variable @default_config_file not initialized
- /lib/jekyll/converter.rb:12: warning: instance variable @highlighter_prefix not initialized
- /lib/jekyll/converter.rb:24: warning: instance variable @highlighter_suffix not initialized
- /lib/jekyll/converters/markdown.rb:9: warning: instance variable @setup not initialized
- /lib/jekyll/converters/markdown/kramdown_parser.rb:60: warning: instance variable @highlighter not initialized
- /lib/jekyll/frontmatter_defaults.rb:97: warning: shadowing outer local variable - path
- /lib/jekyll/plugin.rb:66: warning: instance variable @safe not initialized
- /lib/jekyll/regenerator.rb:147: warning: instance variable @disabled not initialized
- /test/test_convertible.rb:40: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_filters.rb:154: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_new_command.rb:84: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_site.rb:234: warning: assigned but unused variable - site
- /test/test_site.rb:240: warning: assigned but unused variable - site
- /test/test_site.rb:522: warning: assigned but unused variable - source
- /test/test_tags.rb:153: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:425: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:449: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:496: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:496: warning: instance variable @result not initialized
- /test/test_tags.rb:511: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:773: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:773: warning: instance variable @result not initialized
- /test/test_tags.rb:788: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_url.rb:66: warning: shadowing outer local variable - doc
- /lib/jekyll/url.rb:119:in `escape_path': warning: URI.escape is obsolete
2016-03-25 22:03:17 +01:00
chrisfinazzo 7cdc8394aa Highlight the test code 2016-03-25 15:30:53 -04:00
jekyllbot f16c5d0e65 Update history to reflect merge of #4640 [ci skip] 2016-03-25 12:19:17 -07:00
jekyllbot 1ab0ed3664 Merge pull request #4640 from surrim/symlink_static_files
Merge pull request 4640
2016-03-25 12:19:17 -07:00
Ben Balter 0f90fe67d2 but who will test the testers? 2016-03-25 15:00:42 -04:00
Ben Balter 4a70382d5b test that themes register with sass 2016-03-25 14:48:44 -04:00
Ben Balter bdaa0c3b5b register sass path 2016-03-25 14:46:00 -04:00
surrim 9be387ef6f readded "env=prod"-condition 2016-03-25 19:42:53 +01:00
Pierre Fenoll f60d3a8dbc Allow symlinks iff they point to stuff inside site.source 2016-03-25 15:14:04 +01:00
jekyllbot 9234fa7510 Update history to reflect merge of #3849 [ci skip] 2016-03-24 13:54:04 -07:00
jekyllbot 7a4817e55a Merge pull request #3849 from shinkondo/master
Merge pull request 3849
2016-03-24 13:54:03 -07:00
jekyllbot f0e9b378f6 Update history to reflect merge of #4624 [ci skip] 2016-03-24 12:50:06 -07:00
jekyllbot da4a664290 Merge pull request #4624 from jeffkole/feature/add-collection-url-tag
Merge pull request 4624
2016-03-24 12:50:05 -07:00
jekyllbot 9fc4a85806 Update history to reflect merge of #4704 [ci skip] 2016-03-24 12:40:50 -07:00
jekyllbot 59d1a122c6 Merge pull request #4704 from jekyll/parkr-patch-1
Merge pull request 4704
2016-03-24 12:40:49 -07:00
jekyllbot 0f2df6c7b3 Update history to reflect merge of #4706 [ci skip] 2016-03-24 12:40:16 -07:00
jekyllbot c7d4386b63 Merge pull request #4706 from yordis/patch-1
Merge pull request 4706
2016-03-24 12:40:15 -07:00
Jeff Kolesky 54fcc97725 Checks for link file extension in tests 2016-03-24 08:54:31 -07:00
Yordis Prieto 5f97f928de Updating assets documentation
Just because developer are lazy and tools like this is for move forward faster, normally we don't read (it's a fact) and because of that I missed this super important sentence. At least this should help.
2016-03-24 09:52:16 -04:00
Shinn Kondo c27c669796 Fix test teardown for cleaner. 2016-03-23 20:37:13 -05:00
jekyllbot c6564d352b Update history to reflect merge of #4542 [ci skip] 2016-03-23 17:49:47 -07:00
jekyllbot 87d0f03f5c Merge pull request #4542 from jekyll/jekyll-new-with-gemfile
Merge pull request 4542
2016-03-23 17:49:46 -07:00
Parker Moore 7695ba6eb4 Add explanation of site variables in the example _config.yml 2016-03-23 17:44:11 -07:00
Shinn Kondo 01d48320fd Merge remote-tracking branch 'upstream/master' 2016-03-23 19:33:22 -05:00
Parker Moore 22d9312eaf Use double quotes in the gemfile 2016-03-23 17:25:19 -07:00
Parker Moore da35e134f1
Add test for creation of Gemfile by 'jekyll new' 2016-03-23 17:24:38 -07:00
Parker Moore 09f9f193d8 Add comment about github-pages 2016-03-23 17:15:35 -07:00
jekyllbot 0c172f6463 Update history to reflect merge of #4533 [ci skip] 2016-03-23 17:01:16 -07:00
jekyllbot 4ce50e3936 Merge pull request #4533 from hgoodman/feature/show-dir-listing
Merge pull request 4533
2016-03-23 17:01:16 -07:00
Tom Fejfar 007b7d45dc
Ensure Rouge closes its div/figure properly after highlighting ends.
Fixes #4474
2016-03-23 14:04:11 -07:00
Parker Moore 9b60df8883
Add Site#config= which can be used to set the config 2016-03-23 13:14:30 -07:00
Parker Moore 84b7d9b3ac
Add Hook for :site :after_init 2016-03-23 13:14:08 -07:00
jekyllbot b5e459430b Update history to reflect merge of #4700 [ci skip] 2016-03-23 08:46:02 -07:00
jekyllbot d2c754c0fe Merge pull request #4700 from KrzysiekJ/jekyll-paspagon-plugin
Merge pull request 4700
2016-03-23 08:46:01 -07:00
Krzysztof Jurewicz 8786163f35 Add jekyll-paspagon plugin 2016-03-23 10:00:13 +01:00
jekyllbot e1fe161071 Update history to reflect merge of #4694 [ci skip] 2016-03-22 15:09:57 -07:00
jekyllbot e873934d60 Merge pull request #4694 from pathawks/pr/xml_escape
Merge pull request 4694
2016-03-22 15:09:57 -07:00
jekyllbot f542d817b0 Update history to reflect merge of #4699 [ci skip] 2016-03-22 14:55:55 -07:00
jekyllbot 4cb6b249f1 Merge pull request #4699 from chrisfinazzo/fix-resources-url
Merge pull request 4699
2016-03-22 14:55:54 -07:00