0c234c90a9 
								
							 
						 
						
							
							
								
								TestGeneratedSite: add "|" to preserve newline  
							
							... 
							
							
							
							adding a pipe character ('|') preserves the formatting of
'expected_output' with a trailing newline bit, in windows. 
							
						 
						
							2016-11-02 15:08:49 +05:30  
				
					
						
							
							
								 
						
							
								a2ffde8f14 
								
							 
						 
						
							
							
								
								rewrite test to only not throw error  
							
							
							
						 
						
							2016-11-02 00:22:20 +01:00  
				
					
						
							
							
								 
						
							
								1bb2259a10 
								
							 
						 
						
							
							
								
								add failing test  
							
							
							
						 
						
							2016-11-02 00:00:38 +01:00  
				
					
						
							
							
								 
						
							
								6f05ebb520 
								
							 
						 
						
							
							
								
								Merge pull request  #5433  from ayastreb/5429-data-dir-with-period-in-name  
							
							... 
							
							
							
							Merge pull request 5433 
							
						 
						
							2016-10-06 10:22:23 -07:00  
				
					
						
							
							
								 
						
							
								3de78877c0 
								
							 
						 
						
							
							
								
								Merge pull request  #4873  from mlocher/bug-post-url  
							
							... 
							
							
							
							Merge pull request 4873 
							
						 
						
							2016-10-05 11:40:04 -07:00  
				
					
						
							
							
								 
						
							
								22a7714bba 
								
							 
						 
						
							
							
								
								Merge pull request  #5212  from eloyesp/fix-excerpt-link-finder  
							
							... 
							
							
							
							Merge pull request 5212 
							
						 
						
							2016-10-05 11:34:52 -07:00  
				
					
						
							
							
								 
						
							
								275f5a6209 
								
							 
						 
						
							
							
								
								Merge pull request  #5256  from kwokfu/patch-1  
							
							... 
							
							
							
							Merge pull request 5256 
							
						 
						
							2016-10-05 11:34:06 -07:00  
				
					
						
							
							
								 
						
							
								e27a65d9e3 
								
							 
						 
						
							
							
								
								Sanitize directory name as a key  
							
							
							
						 
						
							2016-10-04 19:39:41 +01:00  
				
					
						
							
							
								 
						
							
								01c33907a3 
								
							 
						 
						
							
							
								
								default site.url in dev environment to ` http://localhost:4000 `  
							
							... 
							
							
							
							take `host`, `port` and `ssl` options into account 
							
						 
						
							2016-10-04 20:38:46 +02:00  
				
					
						
							
							
								 
						
							
								cff8f2994c 
								
							 
						 
						
							
							
								
								Fix loading data from subdir with a period in name  #5429  
							
							
							
						 
						
							2016-10-01 13:09:50 +01:00  
				
					
						
							
							
								 
						
							
								ef3f9d0e7a 
								
							 
						 
						
							
							
								
								Merge pull request  #5264  from DirtyF/static-file-name  
							
							... 
							
							
							
							Merge pull request 5264 
							
						 
						
							2016-09-29 14:13:31 -07:00  
				
					
						
							
							
								 
						
							
								553fae8f17 
								
							 
						 
						
							
							
								
								Merge pull request  #5410  from jekyll/pr/i18n-url-filters  
							
							... 
							
							
							
							Merge pull request 5410 
							
						 
						
							2016-09-29 13:27:11 -07:00  
				
					
						
							
							
								 
						
							
								fd5f2eb399 
								
							 
						 
						
							
							
								
								Add failing test for File.utime of a symlink in staticfile.  
							
							
							
						 
						
							2016-09-28 16:54:58 -07:00  
				
					
						
							
							
								 
						
							
								9c197d9555 
								
							 
						 
						
							
							
								
								Merge pull request  #5210  from jekyll/node-must-die  
							
							... 
							
							
							
							Merge pull request 5210 
							
						 
						
							2016-09-28 16:38:00 -07:00  
				
					
						
							
							
								 
						
							
								2b30c06140 
								
							 
						 
						
							
							
								
								Use Addressable to better deal with i18n URLs  
							
							
							
						 
						
							2016-09-24 15:34:00 -05:00  
				
					
						
							
							
								 
						
							
								aebf711c61 
								
							 
						 
						
							
							
								
								Failing tests: URL filters choke on i18n  
							
							
							
						 
						
							2016-09-24 15:11:04 -05:00  
				
					
						
							
							
								 
						
							
								bacb300876 
								
							 
						 
						
							
							
								
								Skip Windows tests in non-Windows environment.  
							
							
							
						 
						
							2016-09-24 21:55:02 +08:00  
				
					
						
							
							
								 
						
							
								db53213d16 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'jekyll/master' into patch-1  
							
							
							
						 
						
							2016-09-24 08:46:24 +08:00  
				
					
						
							
							
								 
						
							
								aa86651650 
								
							 
						 
						
							
							
								
								Add absolute_url and relative_url filters.  
							
							
							
						 
						
							2016-09-22 14:16:00 -07:00  
				
					
						
							
							
								 
						
							
								3a7cbadd82 
								
							 
						 
						
							
							
								
								Merge pull request  #5375  from Nicop06/underscore_highlight  
							
							... 
							
							
							
							Merge pull request 5375 
							
						 
						
							2016-09-20 17:05:49 -07:00  
				
					
						
							
							
								 
						
							
								504411e476 
								
							 
						 
						
							
							
								
								Merge pull request  #5237  from ashmaroli/bundle2new  
							
							... 
							
							
							
							Merge pull request 5237 
							
						 
						
							2016-09-20 15:32:25 -07:00  
				
					
						
							
							
								 
						
							
								279f1516d2 
								
							 
						 
						
							
							
								
								Merge branch 'master' into themes-asset-folder  
							
							... 
							
							
							
							* master:
  Update history to reflect merge of #5381  [ci skip]
  Update history to reflect merge of #5383  [ci skip]
  run features on windows
  Appease Rubocop
  Update history to reflect merge of #5372  [ci skip]
  Add missing period to sentence in first paragraph. 
							
						 
						
							2016-09-20 13:13:01 -07:00  
				
					
						
							
							
								 
						
							
								29d8fee4ce 
								
							 
						 
						
							
							
								
								Add test to ensure that the /assets theme reader doesn't clobber preexisting site files.  
							
							
							
						 
						
							2016-09-20 13:12:34 -07:00  
				
					
						
							
							
								 
						
							
								3bfdc00d14 
								
							 
						 
						
							
							
								
								Appease Rubocop  
							
							
							
						 
						
							2016-09-19 13:15:02 -05:00  
				
					
						
							
							
								 
						
							
								0b94cf3fa1 
								
							 
						 
						
							
							
								
								Allow underscore in highlighter language  
							
							
							
						 
						
							2016-09-19 13:10:29 +02:00  
				
					
						
							
							
								 
						
							
								74baeb889a 
								
							 
						 
						
							
							
								
								ThemeAssetsReader: fix tests so everything passes.  
							
							
							
						 
						
							2016-09-18 15:04:15 -04:00  
				
					
						
							
							
								 
						
							
								6d7f305e7c 
								
							 
						 
						
							
							
								
								Add tests for assets directory support.  
							
							
							
						 
						
							2016-09-16 16:04:35 -07:00  
				
					
						
							
							
								 
						
							
								cf26bf5db0 
								
							 
						 
						
							
							
								
								TestTheme: update tests for 'path_for' now that it's no longer prepending the underscore  
							
							
							
						 
						
							2016-09-16 15:36:33 -07:00  
				
					
						
							
							
								 
						
							
								b8f17b9034 
								
							 
						 
						
							
							
								
								Exclude node_modules by default  
							
							... 
							
							
							
							If no 'exclude' directive is specified, exclude node_modules by default.
https://twitter.com/mxstbr/status/761856359579185153  
							
						 
						
							2016-09-16 13:09:10 -07:00  
				
					
						
							
							
								 
						
							
								4888b84b44 
								
							 
						 
						
							
							
								
								Merge pull request  #5199  from jeffkole/adds-linking-to-all-files  
							
							... 
							
							
							
							Merge pull request 5199 
							
						 
						
							2016-09-13 07:11:50 -07:00  
				
					
						
							
							
								 
						
							
								345f043cc4 
								
							 
						 
						
							
							
								
								test bundle install and skipping it.  
							
							
							
						 
						
							2016-09-13 08:52:54 +05:30  
				
					
						
							
							
								 
						
							
								c1e6f1fb94 
								
							 
						 
						
							
							
								
								Fix rubocop errors & add one more test for slugify 'ascii' mode ( #4680 )  
							
							
							
						 
						
							2016-09-07 17:50:14 -07:00  
				
					
						
							
							
								 
						
							
								9164973a6c 
								
							 
						 
						
							
							
								
								Merge branch 'jussikinnula-master'  
							
							... 
							
							
							
							* jussikinnula-master:
  Fix slugify test
  One final "urlsafe" replaced with "ascii"
  Change urlsafe to ascii also when actually slugifying
  Add tests for ascii slugify mode
  Rename urlsafe to ascii, and document it (on utils.rb)
  Add urlsafe to accepted slugify modes
  Add urlsafe method for slugify 
							
						 
						
							2016-09-07 16:50:32 -07:00  
				
					
						
							
							
								 
						
							
								9b09d8a8e8 
								
							 
						 
						
							
							
								
								Add support for indented link references on excerpt  
							
							... 
							
							
							
							Excerpt link reference extraction is missing all the indented references
at the bottom of the page. Markdown specify that those can be indented up
to three spaces. 
							
						 
						
							2016-09-02 17:21:10 -03:00  
				
					
						
							
							
								 
						
							
								6a34966f20 
								
							 
						 
						
							
							
								
								Merge pull request  #5189  from jekyll/skip-theme-if-not-string  
							
							... 
							
							
							
							Merge pull request 5189 
							
						 
						
							2016-08-30 14:54:47 -07:00  
				
					
						
							
							
								 
						
							
								5b21f8fda9 
								
							 
						 
						
							
							
								
								Fix fmt errors.  
							
							
							
						 
						
							2016-08-30 13:28:46 -07:00  
				
					
						
							
							
								 
						
							
								2b15b0b325 
								
							 
						 
						
							
							
								
								Site#configure_theme: don't do anything if theme config is unset; TEST  
							
							
							
						 
						
							2016-08-30 12:17:24 -07:00  
				
					
						
							
							
								 
						
							
								a9da814f17 
								
							 
						 
						
							
							
								
								add basename and name variables for static files  
							
							
							
						 
						
							2016-08-27 11:22:24 +02:00  
				
					
						
							
							
								 
						
							
								23d7929948 
								
							 
						 
						
							
							
								
								Test case for issue  #5192 , where Jekyll.sanitized_path strips drive name on Windows incorrectly  
							
							
							
						 
						
							2016-08-26 11:43:32 +08:00  
				
					
						
							
							
								 
						
							
								0d8796fbe6 
								
							 
						 
						
							
							
								
								Test case for issue  #5276 , where Jekyll.sanitized_path strips base path incorrectly if file path has matching prefix  
							
							
							
						 
						
							2016-08-26 11:20:03 +08:00  
				
					
						
							
							
								 
						
							
								326332a5d5 
								
							 
						 
						
							
							
								
								Rename filename to name  
							
							
							
						 
						
							2016-08-21 21:32:26 +02:00  
				
					
						
							
							
								 
						
							
								87c00b2756 
								
							 
						 
						
							
							
								
								Get static filename  
							
							
							
						 
						
							2016-08-20 17:42:05 +02:00  
				
					
						
							
							
								 
						
							
								a9f92278d3 
								
							 
						 
						
							
							
								
								colorize interpolated text in Jekyll.logger.info  
							
							
							
						 
						
							2016-08-16 22:50:54 +05:30  
				
					
						
							
							
								 
						
							
								70ba8c578a 
								
							 
						 
						
							
							
								
								update require_gems test  
							
							
							
						 
						
							2016-08-07 21:01:09 +02:00  
				
					
						
							
							
								 
						
							
								539154a158 
								
							 
						 
						
							
							
								
								replace `assert false, ...` with `refute`  
							
							
							
						 
						
							2016-08-07 20:54:22 +02:00  
				
					
						
							
							
								 
						
							
								e0ce4a00f8 
								
							 
						 
						
							
							
								
								Fixes `link` tag to work with static files  
							
							
							
						 
						
							2016-08-04 20:03:01 -07:00  
				
					
						
							
							
								 
						
							
								05445b81c7 
								
							 
						 
						
							
							
								
								Fixes tests to account for new info.md file  
							
							
							
						 
						
							2016-08-04 19:40:14 -07:00  
				
					
						
							
							
								 
						
							
								82d6657ae8 
								
							 
						 
						
							
							
								
								Adds ability to link to all files  
							
							... 
							
							
							
							Fixes request made in #4624  and bug found in #5182  
							
						 
						
							2016-08-03 15:08:26 -07:00  
				
					
						
							
							
								 
						
							
								d158d73ce1 
								
							 
						 
						
							
							
								
								add missing tests  
							
							
							
						 
						
							2016-07-30 15:49:16 +02:00  
				
					
						
							
							
								 
						
							
								2236ee4284 
								
							 
						 
						
							
							
								
								migrate existing tests to `should` syntax  
							
							
							
						 
						
							2016-07-30 15:48:21 +02:00  
				
					
						
							
							
								 
						
							
								0f3ce73516 
								
							 
						 
						
							
							
								
								Merge pull request  #4860  from pathawks/pr/where_exp  
							
							... 
							
							
							
							Merge pull request 4860 
							
						 
						
							2016-07-25 12:16:55 -07:00  
				
					
						
							
							
								 
						
							
								9176924eab 
								
							 
						 
						
							
							
								
								filters: raise error if no input given to date filters  
							
							
							
						 
						
							2016-07-24 01:37:35 +03:00  
				
					
						
							
							
								 
						
							
								dbc0349909 
								
							 
						 
						
							
							
								
								tests: Typo fixes.  
							
							
							
						 
						
							2016-07-18 21:20:47 +03:00  
				
					
						
							
							
								 
						
							
								eb88aa330c 
								
							 
						 
						
							
							
								
								Merge pull request  #5060  from stomar/stringify-overrides  
							
							... 
							
							
							
							Merge pull request 5060 
							
						 
						
							2016-07-15 17:26:14 -07:00  
				
					
						
							
							
								 
						
							
								3ae7d0c319 
								
							 
						 
						
							
							
								
								Merge pull request  #5101  from crispgm/dev_to_integer_filter  
							
							... 
							
							
							
							Merge pull request 5101 
							
						 
						
							2016-07-15 09:58:08 -07:00  
				
					
						
							
							
								 
						
							
								20b3758edb 
								
							 
						 
						
							
							
								
								Add to_integer filter  
							
							... 
							
							
							
							Add to_integer filter
Fix test_filter: parenthesize the method
Fix offense: seperate every 3 digits with _
rubocop:disable Metrics/ModuleLength
More descriptive exception
Fix fmt error
Remove if stmt for integer input
Remove rescue for to_i
Remove error message assert 
							
						 
						
							2016-07-15 08:38:36 +08:00  
				
					
						
							
							
								 
						
							
								99663a9199 
								
							 
						 
						
							
							
								
								object needs to respond to select instead of being an enumerable  
							
							
							
						 
						
							2016-07-14 13:11:09 -05:00  
				
					
						
							
							
								 
						
							
								2b57795c7f 
								
							 
						 
						
							
							
								
								Failing test: where_exp filter should filter posts  
							
							
							
						 
						
							2016-07-14 13:08:25 -05:00  
				
					
						
							
							
								 
						
							
								73223f3a5a 
								
							 
						 
						
							
							
								
								Fix Rubocop warnings  
							
							
							
						 
						
							2016-07-14 12:15:00 +02:00  
				
					
						
							
							
								 
						
							
								49e97ef9b0 
								
							 
						 
						
							
							
								
								Add test case for deprecated post comparison  
							
							... 
							
							
							
							Checks that `post_url` works for nested posts even if the path isn't specified. Also checks that a deprecation message is shown in the build log. 
							
						 
						
							2016-07-14 11:53:58 +02:00  
				
					
						
							
							
								 
						
							
								1f366730f8 
								
							 
						 
						
							
							
								
								Merge pull request  #5069  from Crunch09/issue-2834  
							
							... 
							
							
							
							Merge pull request 5069 
							
						 
						
							2016-07-12 19:50:32 -07:00  
				
					
						
							
							
								 
						
							
								146d0f301d 
								
							 
						 
						
							
							
								
								Merge pull request  #5067  from jekyll/excerpt-drop-previous-doc  
							
							... 
							
							
							
							Merge pull request 5067 
							
						 
						
							2016-07-11 11:20:22 -07:00  
				
					
						
							
							
								 
						
							
								cc82d44222 
								
							 
						 
						
							
							
								
								check if relative URL contains a colon  
							
							... 
							
							
							
							fixes  #2834  
						
							2016-07-08 20:33:47 +02:00  
				
					
						
							
							
								 
						
							
								ba8573c420 
								
							 
						 
						
							
							
								
								Change baseurl to example.com for some test cases  
							
							
							
						 
						
							2016-07-08 15:48:14 +02:00  
				
					
						
							
							
								 
						
							
								1c0f21230d 
								
							 
						 
						
							
							
								
								Stringify configuration overrides before first use  
							
							... 
							
							
							
							This makes sure that overrides for Jekyll.configuration
all have string keys before their first use, particularly
also the "config" and "skip_config_files" options. 
							
						 
						
							2016-07-08 15:47:26 +02:00  
				
					
						
							
							
								 
						
							
								c46f219d3c 
								
							 
						 
						
							
							
								
								Commit failing test for lack of certain excerpt drop properties.  
							
							
							
						 
						
							2016-07-07 13:34:10 -07:00  
				
					
						
							
							
								 
						
							
								d4c87e3655 
								
							 
						 
						
							
							
								
								Remove useless statement from test  
							
							
							
						 
						
							2016-07-07 15:30:59 +02:00  
				
					
						
							
							
								 
						
							
								3aead1d4a9 
								
							 
						 
						
							
							
								
								Imitate fetch method instead of creating real Hash object  
							
							
							
						 
						
							2016-07-06 11:20:37 +03:00  
				
					
						
							
							
								 
						
							
								72d49490d2 
								
							 
						 
						
							
							
								
								Add fetch method to Drops  
							
							
							
						 
						
							2016-07-05 21:22:24 +03:00  
				
					
						
							
							
								 
						
							
								b772329c60 
								
							 
						 
						
							
							
								
								Merge branch 'master' into remove-jruby-and-ruby-head  
							
							... 
							
							
							
							* master: (41 commits)
  Fix rubocop offenses on master.
  script/fmt: print Rubocop version
  Update history to reflect merge of #5030  [ci skip]
  rubocop: separate deprecator error messages
  Update history to reflect merge of #5031  [ci skip]
  Update history to reflect merge of #5032  [ci skip]
  rubocop: fix code style
  rubocop: fix code style
  rubocop: fix code style
  Update history to reflect merge of #5024  [ci skip]
  Update history to reflect merge of #5025  [ci skip]
  utils: check that the object is a hash when merging default_proc
  Update history to reflect merge of #5026  [ci skip]
  rubocop: refactor modified? method
  Add a benchmark for capture vs. assign in Liquid. [ci skip]
  Update history to reflect merge of #5027  [ci skip]
  Add generator-jekyllized to third party plugins
  rubocop: fix code style
  rubocop: fix code style
  rubocop: fix code style
  ... 
							
						 
						
							2016-06-29 00:52:58 -07:00  
				
					
						
							
							
								 
						
							
								a7d25ed963 
								
							 
						 
						
							
							
								
								Fix rubocop offenses on master.  
							
							
							
						 
						
							2016-06-28 22:08:06 -07:00  
				
					
						
							
							
								 
						
							
								6f3c01ca87 
								
							 
						 
						
							
							
								
								Fix for jruby  
							
							
							
						 
						
							2016-06-28 18:30:02 -07:00  
				
					
						
							
							
								 
						
							
								2ef70fd348 
								
							 
						 
						
							
							
								
								Some weird stuff with Colorator on my machine & jruby.  
							
							
							
						 
						
							2016-06-28 14:39:06 -07:00  
				
					
						
							
							
								 
						
							
								12c1ada0e5 
								
							 
						 
						
							
							
								
								test: skip openssl test for jruby  
							
							
							
						 
						
							2016-06-28 12:43:15 -07:00  
				
					
						
							
							
								 
						
							
								fb1a459ddd 
								
							 
						 
						
							
							
								
								Merge pull request  #4917  from pathawks/pr/normalize_whitespace  
							
							... 
							
							
							
							Merge pull request 4917 
							
						 
						
							2016-06-14 14:03:05 -07:00  
				
					
						
							
							
								 
						
							
								f5a0db9dcc 
								
							 
						 
						
							
							
								
								Rubocop: use %r for all regular expressions.  
							
							
							
						 
						
							2016-06-02 17:08:21 -07:00  
				
					
						
							
							
								 
						
							
								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