mirror of
https://github.com/jekyll/jekyll.git
synced 2026-01-29 08:48:01 -05:00
e56e58e498
* master: (38 commits) Mention where it came from. [ci skip] Update history to reflect merge of #4944 [ci skip] Update history to reflect merge of #4943 [ci skip] Mention where it came from. [ci skip] Update history to reflect merge of #4942 [ci skip] Update history to reflect merge of #4941 External: remove &block arg, use block_given? Update history to reflect merge of #4936 [ci skip] lib/jekyll.rb: require document_drop to ease our pain Sort the results of the require_all glob. Rubocop fixes Reset {{ layout }} between each render & merge layout data properly Add failing test for layout data inheritance bug (#4433) Add failing test for layout bug (#4897) Fix tests for plugins in configuration. Define Drop#each so we can use the new frozen/duping behavior Don't default 'include' and 'exclude' to an empty array Fix some minor things in the tests Freeze configuration defaults & duplicate in deep_merge_hashes if need be. Remove merge conflicts I forgot to fix. ...