2adb70a247 
								
							 
						 
						
							
							
								
								features: writing a configuration file should append if it's already there  
							
							
							
						 
						
							2016-01-18 11:42:59 -08:00  
				
					
						
							
							
								 
						
							
								dd15e3c368 
								
							 
						 
						
							
							
								
								features: write EXIT STATUS to output so it all prints when we get an exit status we aren't expecting  
							
							
							
						 
						
							2016-01-18 11:42:34 -08:00  
				
					
						
							
							
								 
						
							
								7d81c00b29 
								
							 
						 
						
							
							
								
								Renderer: use Convertible's way of picking the last Converter's output extension  
							
							
							
						 
						
							2016-01-18 11:41:47 -08:00  
				
					
						
							
							
								 
						
							
								d343da61eb 
								
							 
						 
						
							
							
								
								Page: pipe through Renderer instead of using Convertible  
							
							
							
						 
						
							2016-01-18 11:41:05 -08:00  
				
					
						
							
							
								 
						
							
								9676b775de 
								
							 
						 
						
							
							
								
								Want the readme and CNAME.  
							
							
							
						 
						
							2016-01-18 08:47:35 -08:00  
				
					
						
							
							
								 
						
							
								4482f80d34 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4364  [ci skip]  
							
							
							
						 
						
							2016-01-18 07:48:11 -08:00  
				
					
						
							
							
								 
						
							
								10ae624d65 
								
							 
						 
						
							
							
								
								Merge pull request  #4364  from jekyll/jmcglone-github-pages-guide  
							
							... 
							
							
							
							Merge pull request 4364 
							
						 
						
							2016-01-18 07:48:11 -08:00  
				
					
						
							
							
								 
						
							
								9c6f33024f 
								
							 
						 
						
							
							
								
								Restructure the resources page a bit  
							
							
							
						 
						
							2016-01-16 12:21:07 -08:00  
				
					
						
							
							
								 
						
							
								b3b4abe80a 
								
							 
						 
						
							
							
								
								Add @jmcglone's guide to github-pages doc page  
							
							... 
							
							
							
							Nearly every day, when I get the report of visitors to jekyllrb.com, I see jmcglone's excellent guide. Reading through it today makes me think it is one of the finest if not _the_ finest guide to getting started with Git, GitHub, and Jekyll in order to publish successfully and happily on GitHub Pages.
@jmcglone, mind if I add this to our GitHub Pages doc page? 
							
						 
						
							2016-01-16 12:09:13 -08:00  
				
					
						
							
							
								 
						
							
								281f75182e 
								
							 
						 
						
							
							
								
								Release  💎  3.1.0.pre.rc1  
							
							
							
						 
						
							2016-01-15 16:26:08 -08:00  
				
					
						
							
							
								 
						
							
								c678640553 
								
							 
						 
						
							
							
								
								Release  💎  v3.1.0.pre.rc1  
							
							
							
						 
						
							2016-01-15 16:25:58 -08:00  
				
					
						
							
							
								 
						
							
								d9aef14063 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4361  [ci skip]  
							
							
							
						 
						
							2016-01-15 16:19:23 -08:00  
				
					
						
							
							
								 
						
							
								0daafd7bda 
								
							 
						 
						
							
							
								
								Merge pull request  #4361  from jekyll/pheuko-empty-permalink  
							
							... 
							
							
							
							Merge pull request 4361 
							
						 
						
							2016-01-15 16:19:22 -08:00  
				
					
						
							
							
								 
						
							
								06fa14c11a 
								
							 
						 
						
							
							
								
								Restructure data validation so that permalink check raises an error.  
							
							
							
						 
						
							2016-01-15 16:11:08 -08:00  
				
					
						
							
							
								 
						
							
								89db3c6384 
								
							 
						 
						
							
							
								
								Convertible: separate data validation out of #read  
							
							
							
						 
						
							2016-01-15 15:52:54 -08:00  
				
					
						
							
							
								 
						
							
								948dcf2714 
								
							 
						 
						
							
							
								
								Convertible: consolidate empty check into Convertible#read  
							
							
							
						 
						
							2016-01-15 15:51:32 -08:00  
				
					
						
							
							
								 
						
							
								15a2dacd37 
								
							 
						 
						
							
							
								
								Merge pull request  #4359  from jekyll/optimize-drop  
							
							... 
							
							
							
							Fix deep_merge_hashes! handling of drops and hashes 
							
						 
						
							2016-01-15 15:19:18 -08:00  
				
					
						
							
							
								 
						
							
								04e1768807 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4359  [ci skip]  
							
							
							
						 
						
							2016-01-15 15:06:56 -08:00  
				
					
						
							
							
								 
						
							
								ea9cac5214 
								
							 
						 
						
							
							
								
								Add a nasty hack to reduce persistence until RSpec.  
							
							
							
						 
						
							2016-01-15 14:15:28 -06:00  
				
					
						
							
							
								 
						
							
								0587a3bb57 
								
							 
						 
						
							
							
								
								Fix some debug logging.  
							
							... 
							
							
							
							- excluded? should now only print when it is excluded
- requiring is now properly aligned 
							
						 
						
							2016-01-15 11:30:02 -08:00  
				
					
						
							
							
								 
						
							
								207fcbdef7 
								
							 
						 
						
							
							
								
								Add byebug for debugging purposes.  
							
							
							
						 
						
							2016-01-15 11:23:09 -08:00  
				
					
						
							
							
								 
						
							
								5d79c55b2c 
								
							 
						 
						
							
							
								
								Fix deep_merge_hashes! handling of drops and hashes  
							
							
							
						 
						
							2016-01-15 11:22:39 -08:00  
				
					
						
							
							
								 
						
							
								22931f42b8 
								
							 
						 
						
							
							
								
								Drop: require 'json' for #inspect call  
							
							
							
						 
						
							2016-01-15 10:00:56 -08:00  
				
					
						
							
							
								 
						
							
								3e81331af1 
								
							 
						 
						
							
							
								
								Utils: don't require mime/types  
							
							
							
						 
						
							2016-01-15 10:00:45 -08:00  
				
					
						
							
							
								 
						
							
								156e093b5c 
								
							 
						 
						
							
							
								
								Ensure no errors when there is no permalink  
							
							
							
						 
						
							2016-01-15 14:40:59 -02:00  
				
					
						
							
							
								 
						
							
								5681742223 
								
							 
						 
						
							
							
								
								Check if permalink key was given  
							
							
							
						 
						
							2016-01-15 14:40:59 -02:00  
				
					
						
							
							
								 
						
							
								f8a63157d7 
								
							 
						 
						
							
							
								
								Empty permalink now shows an error  
							
							
							
						 
						
							2016-01-15 14:40:47 -02:00  
				
					
						
							
							
								 
						
							
								9368e261cc 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4355  [ci skip]  
							
							
							
						 
						
							2016-01-14 16:36:11 -08:00  
				
					
						
							
							
								 
						
							
								54b6395806 
								
							 
						 
						
							
							
								
								Correct typo in ### Precdence  
							
							... 
							
							
							
							The Precedence section referred to the "last example" where it should have referred to the "second to last." 
							
						 
						
							2016-01-14 16:35:58 -08:00  
				
					
						
							
							
								 
						
							
								4048b8e2a7 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4350  [ci skip]  
							
							
							
						 
						
							2016-01-12 08:28:10 -08:00  
				
					
						
							
							
								 
						
							
								9c4695c47f 
								
							 
						 
						
							
							
								
								Merge pull request  #4350  from jekyll/pr/cleanup-gemfile  
							
							... 
							
							
							
							Merge pull request 4350 
							
						 
						
							2016-01-12 08:28:10 -08:00  
				
					
						
							
							
								 
						
							
								5555db8c72 
								
							 
						 
						
							
							
								
								Start using Rubocop from Github, it supports our config.  
							
							
							
						 
						
							2016-01-12 06:59:09 -06:00  
				
					
						
							
							
								 
						
							
								712c16a7f1 
								
							 
						 
						
							
							
								
								Try to cleanup the Gemfile... again.  
							
							... 
							
							
							
							The problem last time was that we removed Pry and Pry brings in CodeRay, we were
testing legacy stuff and didn't have CodeRay in our dependencies, which resulted
in those tests failing.
This also quietly announces the intention to move to RSpec by moving the old
test dependencies to ":test_legacy" and is slightly less agressive in it's
organization than before. 
							
						 
						
							2016-01-12 06:54:45 -06:00  
				
					
						
							
							
								 
						
							
								4595aab855 
								
							 
						 
						
							
							
								
								Update history.makrdown to reflect the merger of  #4349 .  
							
							
							
						 
						
							2016-01-12 01:00:42 -06:00  
				
					
						
							
							
								 
						
							
								9efeade8b4 
								
							 
						 
						
							
							
								
								Merge pull request  #4349  from pathawks/fixme  
							
							... 
							
							
							
							Remove old FIXME 
							
						 
						
							2016-01-12 00:59:42 -06:00  
				
					
						
							
							
								 
						
							
								ba017ebb97 
								
							 
						 
						
							
							
								
								Remove old Fixme note  
							
							
							
						 
						
							2016-01-11 22:32:04 -08:00  
				
					
						
							
							
								 
						
							
								1583b26627 
								
							 
						 
						
							
							
								
								Update jekyll-feed.  
							
							
							
						 
						
							2016-01-11 16:45:50 -06:00  
				
					
						
							
							
								 
						
							
								03582c32ed 
								
							 
						 
						
							
							
								
								site: update generated history per automatic fixes to History.markdown  
							
							
							
						 
						
							2016-01-11 13:37:27 -08:00  
				
					
						
							
							
								 
						
							
								da6618c6fc 
								
							 
						 
						
							
							
								
								site: fix :hour, :minute, :second permalink keys to refer to date front matter value  
							
							... 
							
							
							
							Fixes  #4336  
						
							2016-01-11 13:37:27 -08:00  
				
					
						
							
							
								 
						
							
								a32c77fb87 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4347  [ci skip]  
							
							
							
						 
						
							2016-01-11 13:10:43 -08:00  
				
					
						
							
							
								 
						
							
								4dccb00832 
								
							 
						 
						
							
							
								
								Merge pull request  #4347  from jekyll/rearrange-cucumber-add-flair  
							
							... 
							
							
							
							Merge pull request 4347 
							
						 
						
							2016-01-11 13:10:42 -08:00  
				
					
						
							
							
								 
						
							
								c5b8b3315f 
								
							 
						 
						
							
							
								
								Rearrange Cucumber and add some flair.  
							
							... 
							
							
							
							* Move step_definitions/jekyll.rb to just step_definitions.rb
* Rename the formatter to Jekyll::Cucumber::Formatter, it's Jekyll's.
* Add some flair; switch to checks!
* Rename env.rb to helpers.rb 
							
						 
						
							2016-01-11 14:55:34 -06:00  
				
					
						
							
							
								 
						
							
								597021a813 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4343  [ci skip]  
							
							
							
						 
						
							2016-01-11 08:56:49 -08:00  
				
					
						
							
							
								 
						
							
								3e30c72994 
								
							 
						 
						
							
							
								
								Merge pull request  #4343  from jekyll/pr/cucumber-rspec-expec-jruby-support  
							
							... 
							
							
							
							Merge pull request 4343 
							
						 
						
							2016-01-11 08:56:48 -08:00  
				
					
						
							
							
								 
						
							
								00b9f9dd62 
								
							 
						 
						
							
							
								
								Revert "Update history to reflect merge of  #4344  [ci skip]"  
							
							... 
							
							
							
							This reverts commit 2f36e09db5 
							
						 
						
							2016-01-10 19:57:02 -08:00  
				
					
						
							
							
								 
						
							
								2f36e09db5 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4344  [ci skip]  
							
							
							
						 
						
							2016-01-10 19:55:59 -08:00  
				
					
						
							
							
								 
						
							
								d58e38c1a7 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4344  [ci skip]  
							
							
							
						 
						
							2016-01-10 19:55:45 -08:00  
				
					
						
							
							
								 
						
							
								3fd887f648 
								
							 
						 
						
							
							
								
								Merge pull request  #4344  from alexjbest/patch-1  
							
							... 
							
							
							
							Merge pull request 4344 
							
						 
						
							2016-01-10 19:55:44 -08:00  
				
					
						
							
							
								 
						
							
								6048dcdba2 
								
							 
						 
						
							
							
								
								Fixed broken link to blog on using mathjax with jekyll  
							
							
							
						 
						
							2016-01-10 22:01:46 +00:00  
				
					
						
							
							
								 
						
							
								e192588013 
								
							 
						 
						
							
							
								
								Cleanup .jrubyrc  
							
							... 
							
							
							
							* Remove invoked dynamic, it slows down Ruby.
* Remove ObjectSpace which slows down JRuby, we use inheritance now.
* Remove the compat version 9K is Ruby2 by default. 
							
						 
						
							2016-01-10 14:55:35 -06:00