Commit Graph

5846 Commits

Author SHA1 Message Date
Parker Moore c76c4e478b Convertible#read_yaml should return self.data.
Broken in 4b108df3ab.
2015-04-11 15:42:58 -04:00
chrisfinazzo 25af3e785f Cleanup extra space and formatting 2015-04-10 18:14:09 -04:00
Parker Moore 0374ad2668 Update history to reflect merge of #3468 [ci skip] 2015-04-10 17:29:39 -04:00
Parker Moore 66a9e6909b Merge branch 'davidsilvasmith-origin/patch-3'
* davidsilvasmith-origin/patch-3:
  docs: remove extraneous period from datafiles example.
  updated lsi docs
  changed the codefile name
  forgot a tick around a codefile name
  proofed changes
  removed personal link
  How to access a specific item in the data folder
2015-04-10 17:23:43 -04:00
Parker Moore 2f75ade1b7 docs: remove extraneous period from datafiles example. 2015-04-10 17:23:34 -04:00
Parker Moore 1b5977c018 Update history to reflect the fixing of #3643. 2015-04-10 17:08:53 -04:00
Parker Moore 4b108df3ab convertible: abort with an error if Page/Post#data isn't a hash.
when the default_proc was being assigned, it failed if it wasn't a Hash. We
expect data to be a Hash everywhere, so let's freak out if it isn't after
reading and applying the fallback.

Fixes #3643.
2015-04-10 17:07:14 -04:00
Parker Moore 279fb6af11 Update history to reflect merge of #3607 [ci skip] 2015-04-10 16:58:32 -04:00
Parker Moore 2c316188fe Merge branch 'chrisfinazzo-upgrading-docs'
* chrisfinazzo-upgrading-docs:
  Add further fixes to upgrade doc. #3607
  Use the new commands
  Fix a typo, wrap lines
  Remove reference to the watch command
  Start working on an upgrade guide for Jekyll 3
2015-04-10 16:57:00 -04:00
Parker Moore 20d48fcfe9 Add further fixes to upgrade doc. #3607 2015-04-10 16:56:55 -04:00
Parker Moore 70a3156385 Update history to reflect merge of #3608 [ci skip] 2015-04-10 16:52:50 -04:00
Parker Moore bf98004843 Merge pull request #3608 from nickburlett/patch/incremental-build
Merge pull request 3608
2015-04-10 16:51:56 -04:00
Parker Moore 436c98ad9b Update history to reflect merge of #3623 [ci skip] 2015-04-10 16:33:03 -04:00
Parker Moore 12b16dde52 Merge pull request #3623 from chrisfinazzo/ci-docs
Merge pull request 3623
2015-04-10 16:32:28 -04:00
Parker Moore 9f55b1ff66 Update history to reflect merge of #3632 [ci skip] 2015-04-10 16:32:07 -04:00
Parker Moore eeb13872e3 Merge branch 'delftswa2014-remove-unused-method'
* delftswa2014-remove-unused-method:
  static_file: extract extname in initializer and save as variable. #3632
  removed unused method StaticFile::extname
2015-04-10 16:31:26 -04:00
Parker Moore f14af82da5 static_file: extract extname in initializer and save as variable. #3632 2015-04-10 16:31:19 -04:00
Parker Moore b6ea045e1b Update history to reflect merge of #3647 [ci skip] 2015-04-10 16:28:28 -04:00
Parker Moore 6d6c15eba2 Merge pull request #3647 from nhoizey/patch-1
Merge pull request 3647
2015-04-10 16:28:03 -04:00
Parker Moore a91775fcfe Update history to reflect merge of #3633 [ci skip] 2015-04-10 16:25:34 -04:00
Parker Moore 2c373e6fe9 Merge branch 'delftswa2014-static-file-test'
* delftswa2014-static-file-test:
  DRY up the StaticFile tests a bit. #3633.
  Added tests for Jekyll:StaticFile
2015-04-10 16:24:51 -04:00
Parker Moore f86727c45a DRY up the StaticFile tests a bit. #3633. 2015-04-10 16:24:45 -04:00
Nicolas Hoizey 76416e50e8 Add WOFF2 font format 2015-04-10 00:13:02 +02:00
Parker Moore 90793b12e7 Update history to reflect merge of #3638 [ci skip] 2015-04-08 10:24:33 -07:00
Parker Moore 9c02353b3c Merge pull request #3638 from adunning/patch-1
Merge pull request 3638
2015-04-08 10:24:15 -07:00
Parker Moore 329ed07405 Merge pull request #3637 from Sourdoughh/patch-1
Removed inconsistency with period
2015-04-04 18:05:29 -07:00
Andrew Dunning 305a22a5bf Explain how to access collection variables.
This example also demonstrates the use of nested variables.
2015-04-04 18:40:03 -04:00
Jason Ly a9dbb0de57 Removed inconsistency with period 2015-04-04 14:08:28 -07:00
Martijn den Hoedt 28a1d2445e Added tests for Jekyll:StaticFile 2015-04-01 17:15:44 +02:00
Martijn den Hoedt f0cac685de removed unused method StaticFile::extname 2015-04-01 12:57:49 +02:00
Jordon Bedwell 0e52b83b6f Update history.md to reflect the merger of #3628. 2015-03-30 11:12:55 -05:00
Jordon Bedwell 1ac7f5cb15 Merge pull request #3628 from delftswa2014/profiling
Bring back minitest-profile
2015-03-30 11:11:59 -05:00
Martijn den Hoedt 397492fa38 added the --profile flag to make use of the minitest-profile tool 2015-03-30 17:53:40 +02:00
Justin Weiss fa435fae94 Use `Jekyll::Post`s for both LSI indexing and lookup.
When looking for related posts, Jekyll was indexing `Jekyll::Post`
objects, but finding related posts based on `Jekyll::Post#content`. This
caused two problems:

1. Ruby 2.2 will warn on == if <=> throws an exception (and future Ruby
versions will surface that exception). Because `String`s can't be
compared with `Jekyll::Post`s, this warning was appearing all the time
while searching for related posts.

2. LSI won't return a post itself when searching for related posts. But
LSI could never tell that we were searching on a post, since Jekyll
passed post content, not a post object. With this fix, we can remove the
`- [post]` from `Jekyll::RelatedPosts#find_related`.

This is a more accurate fix for #3484.
2015-03-29 23:43:55 -07:00
Jordon Bedwell b2aa8b6e68 Update history.md to reflect the merger of #3614. 2015-03-28 19:27:26 -05:00
Jordon Bedwell f75346c799 Merge pull request #3614 from nickburlett/patch/incremental-build-dest-missing
Incremental build if destination file missing
2015-03-28 19:26:01 -05:00
chrisfinazzo ec7474f55c Only use 3 sections 2015-03-27 16:50:28 -04:00
Parker Moore 799edabc3d Update history to reflect merge of #3622 [ci skip] 2015-03-27 10:15:35 -07:00
Parker Moore 6d3fc08a40 Merge pull request #3622 from fulldecent/patch-1
Merge pull request 3622
2015-03-27 10:10:12 -07:00
chrisfinazzo e82cb3115d Line wrapping 2015-03-27 10:42:09 -04:00
chrisfinazzo ebc6dff37e Don't repeat yourself 2015-03-27 10:31:40 -04:00
chrisfinazzo 017a26457c Add a warning label 2015-03-27 10:28:51 -04:00
William Entriken 18209ff78c Fixes #3480 Show how to install and use html-proofer without Gemfile 2015-03-27 09:09:06 -04:00
chrisfinazzo d10c46d4fd Use the new commands 2015-03-26 17:52:35 -04:00
Parker Moore 391a672ac4 Update history to reflect merge of #3619 [ci skip] 2015-03-26 10:21:08 -07:00
Parker Moore 86211a020d Merge pull request #3619 from jekyll/no-args-exit-1
Merge pull request 3619
2015-03-26 10:20:45 -07:00
Parker Moore c6dce1660b bin/jekyll: with no args, exit with exit code 1
fixes #3584
2015-03-25 19:03:14 -07:00
Nicholas Burlett 1f8157022a Clean up destination modified check
Clean up the destination modified check in `source_modified_or_dest_missing?` to be easier to read. Note that it can now return `nil` instead of `false` for an unmodified `source_path` and a `nil` `dest_path`, but in a discussion on 706007ead9 we decided that was okay.
2015-03-25 08:51:58 -07:00
Jordon Bedwell d67ad64335 Update history.md to reflect the merger of #3617. 2015-03-25 07:57:20 -05:00
Jordon Bedwell 44b13f408e Merge pull request #3617 from delftswa2014/log-adapter
Removed the word 'Jekyll' a few times from the comments
2015-03-25 07:56:30 -05:00