e097a15657 
								
							 
						 
						
							
							
								
								Merge pull request  #4312  from jekyll/fix-layout-metadata  
							
							... 
							
							
							
							Merge pull request 4312 
							
						 
						
							2016-01-04 13:05:00 -08:00  
				
					
						
							
							
								 
						
							
								95a3c54ddb 
								
							 
						 
						
							
							
								
								drop: only check mutable if the key is a method  
							
							
							
						 
						
							2016-01-04 12:41:40 -08:00  
				
					
						
							
							
								 
						
							
								06c45df8c3 
								
							 
						 
						
							
							
								
								Drop: hash syntax should use setter method for a property if it's defined  
							
							
							
						 
						
							2016-01-04 12:38:41 -08:00  
				
					
						
							
							
								 
						
							
								735194ccaf 
								
							 
						 
						
							
							
								
								Convertible/Page/Renderer: use payload hash accessor & setter syntax  
							
							
							
						 
						
							2016-01-04 12:37:19 -08:00  
				
					
						
							
							
								 
						
							
								060904d809 
								
							 
						 
						
							
							
								
								Rubocop: Style/TrailingWhitespace  
							
							... 
							
							
							
							- Trailing whitespace detected
Rubocop: Style/EmptyLines
 - Extra blank line detected
Rubocop: Style/EmptyLinesAroundBlockBody
 - Extra empty line detected at block body beginning 
							
						 
						
							2016-01-04 12:16:36 -08:00  
				
					
						
							
							
								 
						
							
								ab3d906e04 
								
							 
						 
						
							
							
								
								Rubocop: Style/ParenthesesAroundCondition  
							
							... 
							
							
							
							- Don't use parentheses around the condition of an if 
							
						 
						
							2016-01-04 12:14:00 -08:00  
				
					
						
							
							
								 
						
							
								cce848d3d8 
								
							 
						 
						
							
							
								
								Rubocop: Avoid single-line method definitions  
							
							
							
						 
						
							2016-01-04 12:12:17 -08:00  
				
					
						
							
							
								 
						
							
								c1c8b6dbf7 
								
							 
						 
						
							
							
								
								Rubocop: Style/SpaceInsideHashLiteralBraces  
							
							
							
						 
						
							2016-01-04 12:07:34 -08:00  
				
					
						
							
							
								 
						
							
								04e635b10c 
								
							 
						 
						
							
							
								
								Rubocop: Style/SpaceInsideRangeLiteral  
							
							... 
							
							
							
							- Space inside range literal 
							
						 
						
							2016-01-04 12:06:40 -08:00  
				
					
						
							
							
								 
						
							
								6711234d5f 
								
							 
						 
						
							
							
								
								Rubocop: Style/BlockDelimiters  
							
							... 
							
							
							
							- Avoid using {...} for multi-line blocks 
							
						 
						
							2016-01-04 12:05:54 -08:00  
				
					
						
							
							
								 
						
							
								086e85ca9e 
								
							 
						 
						
							
							
								
								Rubocop: Style/PerlBackrefs  
							
							... 
							
							
							
							- Avoid the use of Perl-style backrefs 
							
						 
						
							2016-01-04 12:01:23 -08:00  
				
					
						
							
							
								 
						
							
								be3666fcf0 
								
							 
						 
						
							
							
								
								Rubocop: Do not use unless with else  
							
							... 
							
							
							
							- Rewrite these with the positive case first 
							
						 
						
							2016-01-04 11:51:14 -08:00  
				
					
						
							
							
								 
						
							
								ec83ef60b5 
								
							 
						 
						
							
							
								
								Rubocop: Lint/UselessAssignment  
							
							
							
						 
						
							2016-01-04 11:49:54 -08:00  
				
					
						
							
							
								 
						
							
								085a778b0a 
								
							 
						 
						
							
							
								
								Rubocop: Style/NestedTernaryOperator  
							
							... 
							
							
							
							- Ternary operators must not be nested. Prefer if/else constructs instead. 
							
						 
						
							2016-01-04 11:46:25 -08:00  
				
					
						
							
							
								 
						
							
								78e9f3389e 
								
							 
						 
						
							
							
								
								Rubocop: Style/IndentationWidth  
							
							
							
						 
						
							2016-01-04 11:42:17 -08:00  
				
					
						
							
							
								 
						
							
								f9926edbc4 
								
							 
						 
						
							
							
								
								Rubocop: Style/TrivialAccessors  
							
							... 
							
							
							
							- Use `attr_writer` to define trivial writer methods 
							
						 
						
							2016-01-04 11:39:14 -08:00  
				
					
						
							
							
								 
						
							
								af9ec6831d 
								
							 
						 
						
							
							
								
								Rubocop: Style/ElseAlignment  
							
							... 
							
							
							
							- Align else with if
Rubocop: Lint/EndAlignment
 - Align end with if 
							
						 
						
							2016-01-04 11:23:06 -08:00  
				
					
						
							
							
								 
						
							
								f6fd9014ba 
								
							 
						 
						
							
							
								
								Rubocop: Style/CaseIndentation  
							
							... 
							
							
							
							- Indent when as deep as case 
							
						 
						
							2016-01-04 11:15:37 -08:00  
				
					
						
							
							
								 
						
							
								2c9a349f9a 
								
							 
						 
						
							
							
								
								Rubocop: Style/Next  
							
							... 
							
							
							
							- Use next to skip iteration 
							
						 
						
							2016-01-04 11:10:52 -08:00  
				
					
						
							
							
								 
						
							
								f221b925b4 
								
							 
						 
						
							
							
								
								Rubocop: Lint/StringConversionInInterpolation  
							
							... 
							
							
							
							- Redundant use of Object#to_s in interpolation 
							
						 
						
							2016-01-04 11:08:31 -08:00  
				
					
						
							
							
								 
						
							
								13c980c896 
								
							 
						 
						
							
							
								
								Rubocop: Style/TrailingComma  
							
							
							
						 
						
							2016-01-04 11:08:31 -08:00  
				
					
						
							
							
								 
						
							
								4c5d77a4b5 
								
							 
						 
						
							
							
								
								Rubocop: Style/EmptyLines  
							
							
							
						 
						
							2016-01-04 11:08:18 -08:00  
				
					
						
							
							
								 
						
							
								fd8fdd87d3 
								
							 
						 
						
							
							
								
								Rubocop: Style/RegexpLiteral  
							
							
							
						 
						
							2016-01-03 17:10:39 -08:00  
				
					
						
							
							
								 
						
							
								e3189e3828 
								
							 
						 
						
							
							
								
								Rubocop: Lint/UnusedMethodArgument  
							
							
							
						 
						
							2016-01-03 17:07:39 -08:00  
				
					
						
							
							
								 
						
							
								11f0aab4b1 
								
							 
						 
						
							
							
								
								Rubocop: Lint/UnusedBlockArgument  
							
							... 
							
							
							
							- Unused block argument 
							
						 
						
							2016-01-03 16:24:13 -08:00  
				
					
						
							
							
								 
						
							
								7ca4f7cd62 
								
							 
						 
						
							
							
								
								Rubocop: Style/Proc  
							
							... 
							
							
							
							- Use proc instead of Proc.new
...and use lambda instead of proc 
							
						 
						
							2016-01-03 16:18:26 -08:00  
				
					
						
							
							
								 
						
							
								af5d51289f 
								
							 
						 
						
							
							
								
								Rubocop: Style/SymbolProc  
							
							... 
							
							
							
							- Pass &:to_sym as an argument to map instead of a block
 - Pass &:capitalize as an argument to select instead of a block
 - Pass &:to_s as an argument to map instead of a block 
							
						 
						
							2016-01-03 16:02:32 -08:00  
				
					
						
							
							
								 
						
							
								704ca6b8cc 
								
							 
						 
						
							
							
								
								Rubocop: Style/NegatedIf  
							
							... 
							
							
							
							- Favor unless over if for negative conditions 
							
						 
						
							2016-01-03 15:59:12 -08:00  
				
					
						
							
							
								 
						
							
								663a2d3279 
								
							 
						 
						
							
							
								
								Rubocop: Style/SpaceBeforeBlockBraces  
							
							... 
							
							
							
							Rubocop: Style/SpaceInsideBlockBraces 
							
						 
						
							2016-01-03 15:58:02 -08:00  
				
					
						
							
							
								 
						
							
								a70d89a862 
								
							 
						 
						
							
							
								
								Rubocop: Style/SpaceAfterComma  
							
							... 
							
							
							
							- Space missing after comma 
							
						 
						
							2016-01-03 15:56:44 -08:00  
				
					
						
							
							
								 
						
							
								cda226de45 
								
							 
						 
						
							
							
								
								Rubocop: Style/EmptyLinesAroundClassBody  
							
							... 
							
							
							
							- Extra empty line detected at class body end 
							
						 
						
							2016-01-03 15:55:33 -08:00  
				
					
						
							
							
								 
						
							
								2530a8cdfc 
								
							 
						 
						
							
							
								
								Rubocop: Style/HashSyntax  
							
							... 
							
							
							
							- Use hash rockets syntax 
							
						 
						
							2016-01-03 15:49:22 -08:00  
				
					
						
							
							
								 
						
							
								d157a04c6d 
								
							 
						 
						
							
							
								
								Rubocop: Performance/StringReplacement  
							
							... 
							
							
							
							- Use delete! instead of gsub!
 - Use tr instead of gsub 
							
						 
						
							2016-01-03 15:47:31 -08:00  
				
					
						
							
							
								 
						
							
								ff5f7b7120 
								
							 
						 
						
							
							
								
								Rubocop: Style/DeprecatedHashMethods  
							
							... 
							
							
							
							- Hash#has_key? is deprecated in favor of Hash#key?
Add method `key?` to Drop 
							
						 
						
							2016-01-03 15:41:04 -08:00  
				
					
						
							
							
								 
						
							
								98a19cdf2b 
								
							 
						 
						
							
							
								
								Rubocop: Style/PercentLiteralDelimiters  
							
							... 
							
							
							
							- %w-literals should be delimited by ( and )
Rubocop: Style/WordArray
 - Use %w or %W for array of words 
							
						 
						
							2016-01-03 15:32:11 -08:00  
				
					
						
							
							
								 
						
							
								fb0457bf3d 
								
							 
						 
						
							
							
								
								Rubocop: Style/AndOr  
							
							... 
							
							
							
							- Use && instead of and
 - Use || instead of or 
							
						 
						
							2016-01-03 15:30:26 -08:00  
				
					
						
							
							
								 
						
							
								6550867051 
								
							 
						 
						
							
							
								
								Rubocop: Style/SpecialGlobalVars  
							
							... 
							
							
							
							- Prefer $LOAD_PATH over $: 
							
						 
						
							2016-01-03 15:29:49 -08:00  
				
					
						
							
							
								 
						
							
								8223ebd861 
								
							 
						 
						
							
							
								
								Use select and find instead of conditional loop  
							
							
							
						 
						
							2016-01-03 15:24:18 -08:00  
				
					
						
							
							
								 
						
							
								0eae36aec2 
								
							 
						 
						
							
							
								
								Rubocop: Style/LineEndConcatenation  
							
							... 
							
							
							
							- Use \ instead of + or << to concatenate those strings 
							
						 
						
							2016-01-03 14:41:49 -08:00  
				
					
						
							
							
								 
						
							
								44d2995277 
								
							 
						 
						
							
							
								
								Rubocop: Style/Semicolon  
							
							... 
							
							
							
							- Do not use semicolons to terminate expressions 
							
						 
						
							2016-01-03 14:40:45 -08:00  
				
					
						
							
							
								 
						
							
								31dd0ebed5 
								
							 
						 
						
							
							
								
								Rubocop: Style/EmptyLiteral  
							
							... 
							
							
							
							- Use array literal [] instead of Array.new
 - Use hash literal {} instead of Hash.new 
							
						 
						
							2016-01-03 14:39:01 -08:00  
				
					
						
							
							
								 
						
							
								f2f88dbd9f 
								
							 
						 
						
							
							
								
								Move require "jekyll/drops/drop" to "jekyll.rb"  
							
							... 
							
							
							
							Linux does not read files in alphanumeric order, this can lead to
Jekyll drops not working on Linux because the assumption here is that
the collection drop will be required first. 
							
						 
						
							2015-12-27 12:48:21 -06:00  
				
					
						
							
							
								 
						
							
								5034216637 
								
							 
						 
						
							
							
								
								Release  💎  3.1.0.pre.beta1  
							
							
							
						 
						
							2015-12-27 08:32:08 -05:00  
				
					
						
							
							
								 
						
							
								7c4876d2eb 
								
							 
						 
						
							
							
								
								Merge pull request  #4289  from jekyll/fix-utils-deep-merge-drops  
							
							... 
							
							
							
							Merge pull request 4289 
							
						 
						
							2015-12-27 08:27:25 -05:00  
				
					
						
							
							
								 
						
							
								1b73751abf 
								
							 
						 
						
							
							
								
								Merge branch 'fixup-custom-markdown'  
							
							... 
							
							
							
							* fixup-custom-markdown:
  markdown: minor style fixes
  Add support for underscores.
  Refactor: lib/jekyll/convertor/markdown.rb - tests: no additions/breaks. 
							
						 
						
							2015-12-27 08:24:16 -05:00  
				
					
						
							
							
								 
						
							
								8e887dcd8b 
								
							 
						 
						
							
							
								
								markdown: minor style fixes  
							
							... 
							
							
							
							ref: #3771  
							
						 
						
							2015-12-27 08:24:00 -05:00  
				
					
						
							
							
								 
						
							
								5bf596b239 
								
							 
						 
						
							
							
								
								utils/drops: update Drop to support Utils.deep_merge_hashes  
							
							... 
							
							
							
							Fixes  #4287  
						
							2015-12-27 08:06:37 -05:00  
				
					
						
							
							
								 
						
							
								d138558c1d 
								
							 
						 
						
							
							
								
								drops: provide #to_h to allow for hash introspection  
							
							... 
							
							
							
							Follow-up to #4277  
							
						 
						
							2015-12-26 14:25:29 -05:00  
				
					
						
							
							
								 
						
							
								3fa8af2a18 
								
							 
						 
						
							
							
								
								drops: create one base Drop class which can be set as mutable or not  
							
							
							
						 
						
							2015-12-26 13:43:42 -05:00  
				
					
						
							
							
								 
						
							
								57613b31dd 
								
							 
						 
						
							
							
								
								Slightly restructure rake helper files  
							
							... 
							
							
							
							Ref #4282  
							
						 
						
							2015-12-26 12:53:30 -05:00