6a07254cbf
Merge pull request #4953 from Crunch09/issue-4850
...
Merge pull request 4953
2016-06-02 16:59:51 -07:00
5dfaa66d48
Failing test: markdownify a number
2016-05-28 15:18:37 -05:00
f8c038566c
`Serve.process` should receive same config as `Build.process`
...
fixes #4850
2016-05-27 11:46:04 +02:00
fbff506faa
Rubocop: test/test_site.rb
2016-05-26 00:00:08 -05:00
5a23b130ce
Rubocop: test/test_utils.rb
2016-05-25 22:01:10 -05:00
8fbeb52314
Rubocop: test/test_tags.rb
2016-05-25 22:00:58 -05:00
98262b73d5
Rubocop: test/test_regenerator.rb
2016-05-25 22:00:29 -05:00
474fc0a9a8
Rubocop: test/test_page.rb
2016-05-25 22:00:15 -05:00
7537b01e74
Rubocop: test/test_liquid_renderer.rb
2016-05-25 22:00:05 -05:00
23646549c4
Rubocop: test/test_kramdown.rb
2016-05-25 21:59:54 -05:00
c00c761e1d
Rubocop: test/test_entry_filter.rb
2016-05-25 21:59:43 -05:00
5291bd0498
Rubocop: test/test_document.rb
2016-05-25 21:59:33 -05:00
fd75f0f7b1
Rubocop: test/test_configuration.rb
2016-05-25 21:59:23 -05:00
6ef2bcb29a
Rubocop: test/test_filters.rb
2016-05-25 21:59:11 -05:00
34d172007b
Merge branch 'pathawks-rubocop/misc'
...
* pathawks-rubocop/misc:
Fix Page#relative_path so that it consistently does NOT have the prepending slash (previously inconsistent)
Rubocop cleanup for lib/jekyll/layout.rb
Rubocop cleanup for lib/jekyll/plugin_manager.rb
Rubocop cleanup for lib/jekyll/page.rb
2016-05-25 17:57:52 -07:00
4fbbeddae2
Fix Page#relative_path so that it consistently does NOT have the prepending slash (previously inconsistent)
...
Fixes for #4946
2016-05-25 17:57:09 -07:00
aff1430608
Fix tests for document drop JSONification based on master updates. /cc #4914
2016-05-25 16:04:16 -07:00
e56e58e498
Merge branch 'master' into pathawks-fp/jsonify-drops
...
* 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.
...
2016-05-25 15:55:47 -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
f8c708ffec
Fix test to simply ensure next is an object in jsonify
2016-05-24 19:08:50 -05:00
17d8c96a63
Add ability to render drops as JSON
...
Previously you could do, e.g. {{ site | jsonify }}, but with the introduction of Liquid Drops, this didn't work anymore.
This PR adds the ability to render drops as JSON. You can safely run drop.to_json and it should Do the Right Thing.
2016-05-24 19:08:46 -05:00
cc0c5ea19e
Rubocop fixes
2016-05-24 19:01:35 -05:00
7641971d7e
Fix tests for plugins in configuration.
2016-05-24 18:49:06 -05:00
de5970ae55
Fix some minor things in the tests
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
4e06f07ad4
Add tests for Configuration#add_default_collections
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
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
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
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
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
ce9a8cb0f2
Moving url to local var for better readability
2016-05-16 20:42:59 -05:00
df585aa5c6
Moving expected output into variable to make asserts more readable
2016-05-16 20:13:50 -05:00
b006810f17
Moving .with down one line 4x times
2016-05-16 19:59:13 -05:00
98eef8af95
Aligning hashes per 2caff75
2016-05-16 19:48:04 -05:00
211c16003e
test/test_exerpt.rb variable assignment cleanup
2016-05-16 19:39:43 -05:00
bc16d13d79
Shortening messages to keep things down to one line where possible
2016-05-16 19:31:43 -05:00
6ef54393c2
Rubocop fixes for test/test_redcarpet.rb
2016-05-16 19:26:53 -05:00
de5d773a6a
Rubocop fixes for test/test_rdiscount.rb
2016-05-16 19:26:53 -05:00
df7992c626
Rubocop fixes for test/test_plugin_manager.rb
2016-05-16 19:26:53 -05:00
df01b6825e
Rubocop fixes for test/test_path_sanitization.rb
2016-05-16 19:26:53 -05:00
jekyllbot
Pat Hawks
Florian Thomas
Parker Moore
Brint O'Hearn