f73b2d0a01
Merge pull request #4934 from pathawks/features
...
Merge pull request 4934
2016-05-26 10:20:42 -07:00
45a5a976f0
Rubocop: features/support/helpers.rb
2016-05-26 12:00:21 -05:00
ab3cda6e58
Rubocop: features/support/formatter.rb
2016-05-26 12:00:01 -05:00
ff591dd5dc
Update history to reflect merge of #4947 [ci skip]
2016-05-26 08:26:43 -07:00
cd63272080
Merge pull request #4947 from pathawks/rubocop/tests
...
Merge pull request 4947
2016-05-26 08:26:42 -07:00
427e30c0f8
Update history to reflect merge of #4950 [ci skip]
2016-05-26 08:25:56 -07:00
87acab9a86
Merge pull request #4950 from pathawks/rubocop/entry_filter
...
Merge pull request 4950
2016-05-26 08:25:55 -07:00
b5aafc3137
Update history to reflect merge of #4951 [ci skip]
2016-05-26 08:24:21 -07:00
f271b8b4b5
Merge pull request #4951 from pathawks/rubocop/stevenson
...
Merge pull request 4951
2016-05-26 08:24:20 -07:00
ae71db4693
Rubocop: lib/jekyll/stevenson.rb
2016-05-26 01:04:12 -05:00
d58c986b2b
Rubocop: lib/jekyll/entry_filter.rb
2016-05-26 00:45:54 -05:00
1cec820628
Rubocop: Tests
2016-05-26 00:00:22 -05: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
746e360c63
Delimeters, delimeters, delimeters.
2016-05-25 18:03:25 -07:00
b950e7dd90
Update history to reflect merge of #4946
...
[ci skip]
2016-05-25 17:58:32 -07: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
cceb8c5876
Update history to reflect merge of #4949 [ci skip]
2016-05-25 16:24:30 -07:00
a15958d5a7
Merge pull request #4949 from jekyll/fix-drop-rubocop-errors
...
Merge pull request 4949
2016-05-25 16:24:29 -07:00
6f1e1d80cd
Rubocop: drop changes from v3.1 forward-ports
2016-05-25 16:10:11 -07:00
b353e181c1
Update history to reflect merge of #4945
...
[ci skip]
2016-05-25 16:05:31 -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
02bf4f1032
Mention where it came from. [ci skip]
2016-05-25 15:49:30 -07:00
d9c9e0238a
Update history to reflect merge of #4944 [ci skip]
2016-05-25 15:46:50 -07:00
dc5fd15f71
Merge pull request #4944 from pathawks/fp/sort-includes
...
Merge pull request 4944
2016-05-25 15:46:50 -07:00
1502d00063
Update history to reflect merge of #4943 [ci skip]
2016-05-25 15:44:24 -07:00
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
de39107c76
Rubocop cleanup for lib/jekyll/layout.rb
2016-05-25 11:28:46 -05:00
65e78b3280
Rubocop cleanup for lib/jekyll/plugin_manager.rb
2016-05-25 11:27:43 -05:00
3a04093e51
Rubocop cleanup for lib/jekyll/page.rb
2016-05-25 11:27:29 -05: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
f8c708ffec
Fix test to simply ensure next is an object in jsonify
2016-05-24 19:08:50 -05:00
jekyllbot
Pat Hawks
jekyllbot
Parker Moore
Brint O'Hearn