0ca45a48e5
Merge pull request #4943 from pathawks/fp/fix-layout-var-overflow
...
Merge pull request 4943
2016-05-25 15:44:23 -07:00
3c0d1a18bf
Mention where it came from. [ci skip]
2016-05-25 15:43:13 -07:00
a7cbb89dfc
Update history to reflect merge of #4942 [ci skip]
2016-05-25 15:42:05 -07:00
cf810a88fa
Merge pull request #4942 from pathawks/fp/configuration-from-permalink-fix
...
Merge pull request 4942
2016-05-25 15:42:05 -07:00
757233754e
Update history to reflect merge of #4941
...
[ci skip]
2016-05-25 09:32:51 -07:00
10543e7c46
Merge branch 'pathawks-fp/ExcerptDrop'
...
* pathawks-fp/ExcerptDrop:
Rubocop fixes
excerpt drop should give access to document's layout
look up the content methods for drops in a smarter way
Use require_relative
Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid
2016-05-25 09:31:27 -07:00
733c56a65e
External: remove &block arg, use block_given?
...
Addresses my comment in https://github.com/jekyll/jekyll/pull/4936#discussion_r64598949
2016-05-25 08:55:12 -07:00
1c937013fd
Update history to reflect merge of #4936 [ci skip]
2016-05-25 08:53:40 -07:00
3292850b98
Merge pull request #4936 from pathawks/passing
...
Merge pull request 4936
2016-05-25 08:53:39 -07:00
cc0c5ea19e
Rubocop fixes
2016-05-24 19:01:35 -05:00
db7cd6f612
Reset {{ layout }} between each render & merge layout data properly
2016-05-24 18:57:54 -05:00
8e939cd86e
Add failing test for layout data inheritance bug ( #4433 )
2016-05-24 18:57:54 -05:00
a99adcafaa
Add failing test for layout bug ( #4897 )
2016-05-24 18:57:53 -05:00
7641971d7e
Fix tests for plugins in configuration.
2016-05-24 18:49:06 -05:00
48274244e3
Define Drop#each so we can use the new frozen/duping behavior
2016-05-24 18:49:06 -05:00
d5c3785d29
Don't default 'include' and 'exclude' to an empty array
2016-05-24 18:49:06 -05:00
de5970ae55
Fix some minor things in the tests
2016-05-24 18:49:05 -05:00
d84844c223
Freeze configuration defaults & duplicate in deep_merge_hashes if need be.
2016-05-24 18:49:05 -05:00
ad59b6e62a
Remove merge conflicts I forgot to fix.
2016-05-24 18:49:02 -05:00
37b93f10dd
Add missing 'end' to test/helper.rb
2016-05-24 18:47:15 -05:00
59346eb228
Remove call to #backwards_compatibilize in Configuration.from
2016-05-24 18:47:15 -05:00
8af77643c5
Site#site_payload: sort collections by label
2016-05-24 18:47:15 -05:00
f52a0e7200
Configuration#add_default_collections: fix bug where DEFAULTS['collections'] is modified
2016-05-24 18:47:15 -05:00
d01f7943de
Add Configuration.from & use in Jekyll.configuration.
...
This process streamlines the creation of new configurations. Creating a new
site will choke if not all the correct options are given.
Configuration.from will ensure the overrides have all string keys and
ensures all the common issues & defaults are in place so a Site can be
created.
A common use:
config = Configuration.from({ 'permalink' => '/:title/' }) # etc
site = Jekyll::Site.new(config)
2016-05-24 18:47:15 -05:00
fab092fcec
Remove use of Marshal in runtime code.
2016-05-24 18:47:15 -05:00
4e06f07ad4
Add tests for Configuration#add_default_collections
2016-05-24 18:47:14 -05:00
6eaa8e90f8
Don't read a config file if the filename is empty.
2016-05-24 18:47:14 -05:00
04d4473119
Use Marshal to duplicate configuration defaults to prevent manipulation
2016-05-24 18:47:14 -05:00
dbcbf809ff
Refactor some tests to prevent manipulation of Jekyll::Config::DEFAULTS
2016-05-24 18:47:04 -05:00
f2263a11b7
Only write collections.posts.permalink if permalink is set.
2016-05-24 18:40:19 -05:00
c69ca4c11e
Test#build_configs shouldn't overwrite default collections
2016-05-24 18:40:19 -05:00
48f16974ce
Rubocop fixes
2016-05-24 18:27:37 -05:00
7d3f8ac75d
excerpt drop should give access to document's layout
2016-05-24 17:35:03 -05:00
c0910f2bc5
look up the content methods for drops in a smarter way
2016-05-24 17:34:49 -05:00
3896f6d5d8
Use require_relative
2016-05-24 17:32:33 -05:00
b019234007
Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid
2016-05-24 17:30:03 -05:00
a8d27e5788
Rubocop: Low hanging fruit
2016-05-23 22:10:49 -05:00
e02049727b
Update history to reflect merge of #4916
...
[ci skip]
2016-05-23 13:44:00 -07:00
6eaf2634f2
Merge pull request #4916 from brint/rubocop_cleaning
...
Merge pull request 4916
2016-05-23 13:36:48 -07:00
dbda462c2f
Adding double quotes & freeze back to version after rebase
2016-05-20 21:51:16 -05:00
6db5272528
Splitting args onto own lines in test/test_static_file.rb
...
For functions where the character limit was exceeded
and line wrapping was needed, this commit just splits
each arg into it's own line.
2016-05-20 21:24:34 -05:00
281a873c71
lib/jekyll/utils/platforms.rb didn't have any rubocop errors
2016-05-20 21:24:34 -05:00
d743c80357
Rubocop fixes for lib/jekyll/utils/ansi.rb
2016-05-20 21:24:34 -05:00
e85f2a0ee9
Rubocop fixes for lib/jekyll/version.rb
2016-05-20 21:24:34 -05:00
8f07affe2a
Rubocop fixes for test/test_related_posts.rb
2016-05-20 21:23:29 -05:00
a9f110b861
Rubocop fixes for test/test_sass.rb
2016-05-20 21:23:29 -05:00
16c1146b4f
Rubocop fixes for test/test_static_file.rb
2016-05-20 21:23:29 -05:00
1380836a4b
Rubocop fixes for test/test_theme.rb
2016-05-20 21:23:29 -05:00
013e2f159d
Rubocop fixes for test/test_url.rb
2016-05-20 21:23:29 -05:00
498324bbff
Release 💎 3.2.0.pre.beta1
2016-05-20 19:19:26 -07:00
jekyllbot
Parker Moore
jekyllbot
Pat Hawks
Brint O'Hearn