Commit Graph

7018 Commits

Author SHA1 Message Date
jekyllbot a42d0ad9e9 Update history to reflect merge of #4756 [ci skip] 2016-04-06 18:25:00 -07:00
jekyllbot ec105b3e54 Merge pull request #4756 from keegoid/master
Merge pull request 4756
2016-04-06 18:24:59 -07:00
jekyllbot 4528772e20 Update history to reflect merge of #4760 [ci skip] 2016-04-06 17:15:01 -07:00
jekyllbot 5457fa16f6 Merge pull request #4760 from clarkwinkelmann/patch-2
Merge pull request 4760
2016-04-06 17:15:00 -07:00
jekyllbot a473b45e35 Update history to reflect merge of #4741 [ci skip] 2016-04-06 17:14:29 -07:00
jekyllbot 41c3dd4cde Merge pull request #4741 from jekyll/sortable-doc-drop
Merge pull request 4741
2016-04-06 17:14:28 -07:00
jekyllbot 071e775a55 Update history to reflect merge of #4763 [ci skip] 2016-04-06 09:58:29 -07:00
jekyllbot cb6e2574ce Merge pull request #4763 from shengbinmeng/patch-1
Merge pull request 4763
2016-04-06 09:58:29 -07:00
Shengbin Meng 413783c4e8 Fix a typo in pagination doc 2016-04-07 00:35:24 +08:00
Jordon Bedwell daf638b600 Merge pull request #4758 from nscyclone/typo-in-contributing.md
Fixed a typo in 'contributing'.
2016-04-05 14:38:24 -05:00
Jordon Bedwell a449512912 Merge pull request #4759 from clarkwinkelmann/patch-1
Fixed the example fork url in CONTRIBUTING
2016-04-05 14:38:02 -05:00
Clark Winkelmann 41e2994868 Switch second GitHub Pages link to HTTPS
This was pretty disturbing
2016-04-05 20:58:39 +02:00
Clark Winkelmann 51f79a4387 Fixed the example fork url in CONTRIBUTING 2016-04-05 20:51:33 +02:00
nscyclone 6422477c5e Fixed a typo in 'contributing'. 2016-04-05 20:55:51 +03:00
Keegan Mullaney 19a8473023 fix typo
lcoally => locally

 Changes to be committed:
	modified:   .github/CONTRIBUTING.markdown
	modified:   site/_docs/contributing.md
2016-04-05 16:49:38 +08:00
jekyllbot e801d55ddf Update history to reflect merge of #4755 [ci skip] 2016-04-04 14:54:33 -07:00
jekyllbot ade2847301 Merge pull request #4755 from awood/master
Merge pull request 4755
2016-04-04 14:54:33 -07:00
Alex Wood 7040448b75 Add entry linking to the Hawkins plugin. 2016-04-04 16:23:30 -04:00
Parker Moore d5b26c94d2 Merge pull request #4750 from SuriyaaKudoIsc/patch-23
Small edits in .github/CONTRIBUTING.markdown
2016-04-03 20:32:03 -07:00
Parker Moore eadba642ce Merge pull request #4751 from SuriyaaKudoIsc/patch-24
Set protocol of jekyllrb.com to HTTPS
2016-04-03 20:31:32 -07:00
Suriyaa Kudo 387c40f667 Set protocol of jekyllrb.com to HTTPS 2016-04-03 10:28:09 +02:00
Suriyaa Kudo 2bd3815b42 Small edits 2016-04-03 10:25:18 +02:00
jekyllbot df2a92cb39 Update history to reflect merge of #4717 [ci skip] 2016-03-31 18:40:15 -07:00
jekyllbot a224491d20 Merge pull request #4717 from jekyll/cleanup-launch-browser
Merge pull request 4717
2016-03-31 18:40:15 -07:00
jekyllbot 7861f12727 Update history to reflect merge of #4537 [ci skip] 2016-03-31 18:37:33 -07:00
jekyllbot 6ee728efcb Merge pull request #4537 from Crunch09/fix-warnings
Merge pull request 4537
2016-03-31 18:37:32 -07:00
jekyllbot ba9a28474f Update history to reflect merge of #4720 [ci skip] 2016-03-31 18:31:18 -07:00
jekyllbot 6c9200252a Merge pull request #4720 from jekyll/feature/upgrade-rake
Merge pull request 4720
2016-03-31 18:31:17 -07:00
Parker Moore 4b471fe9fb
DocumentDrop: add `#<=>` which sorts by date (falling back to path) 2016-03-31 13:41:59 -07:00
Jordon Bedwell f80321ecac Update Rake.
Update Rake and disable verbosity when running the specs because we have some
deprecated usage (for now -- however, see: jekyll/jekyll#4719) and because
Rouge, and Liquid throw out thousands (probably hyperbolic) of warnigns when the
specs are being ran.  We need upstream to fix their problems while we fix ours
or we'll all have a bad day, not that we aren't already.
2016-03-27 22:22:35 -05:00
Jordon Bedwell 06ab708edf Don't blindly assume the last-system.
As it was we assumed that any system that wasn't Windows or OS X must be Linux
but the reality of that can be very unlikely. BSD is popular in some places and
it's not Linux and this would cause an error there.  If we do not know the
launcher for a platform we should ship an error and have the user file
a bug if they feel it necessary and skip the launch otherwise.
2016-03-27 21:41:23 -05: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
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
surrim 9be387ef6f readded "env=prod"-condition 2016-03-25 19:42:53 +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