571bdd686c 
								
							 
						 
						
							
							
								
								Move tests for symlinked files to separate test cases  
							
							
							
						 
						
							2013-04-01 12:02:15 +02:00  
				
					
						
							
							
								 
						
							
								0bebe0f31c 
								
							 
						 
						
							
							
								
								Add test for processing of symlinked static files and pages  
							
							
							
						 
						
							2013-03-31 20:20:15 +02:00  
				
					
						
							
							
								 
						
							
								a054ce2788 
								
							 
						 
						
							
							
								
								Merge pull request  #861  from danielgrieve/gist-tag  
							
							... 
							
							
							
							display single files from gist 
							
						 
						
							2013-03-17 13:33:10 -07:00  
				
					
						
							
							
								 
						
							
								0765d07730 
								
							 
						 
						
							
							
								
								Added sanity tests for  #869 .  
							
							
							
						 
						
							2013-03-17 21:15:17 +01:00  
				
					
						
							
							
								 
						
							
								6c1a08ce87 
								
							 
						 
						
							
							
								
								Merge pull request  #862  from mojombo/fix-autogen-dest-prob  
							
							... 
							
							
							
							Stop DirectoryWatcher from watching the destination directory 
							
						 
						
							2013-03-17 12:48:30 -07:00  
				
					
						
							
							
								 
						
							
								936ed1f849 
								
							 
						 
						
							
							
								
								Merge pull request  #837  from ixti/feature-excerpt  
							
							... 
							
							
							
							Adds excerpt to posts 
							
						 
						
							2013-03-17 07:53:41 -07:00  
				
					
						
							
							
								 
						
							
								aa7a234c18 
								
							 
						 
						
							
							
								
								Merge master into jekyll-new  
							
							
							
						 
						
							2013-03-17 15:45:37 +01:00  
				
					
						
							
							
								 
						
							
								5d34a4c533 
								
							 
						 
						
							
							
								
								Merge pull request  #864  from mojombo/prioritize_plugins  
							
							... 
							
							
							
							Prioritize plugins & DRY subclass instantiation 
							
						 
						
							2013-03-16 12:09:43 -07:00  
				
					
						
							
							
								 
						
							
								d091cfe3fc 
								
							 
						 
						
							
							
								
								Merge pull request  #863  from mojombo/accept-custom-config  
							
							... 
							
							
							
							Accept custom configuration 
							
						 
						
							2013-03-16 12:07:31 -07:00  
				
					
						
							
							
								 
						
							
								39f144ed01 
								
							 
						 
						
							
							
								
								Newline.  
							
							
							
						 
						
							2013-03-16 20:06:50 +01:00  
				
					
						
							
							
								 
						
							
								1d05e0be81 
								
							 
						 
						
							
							
								
								Added tests for generators.  
							
							
							
						 
						
							2013-03-16 20:06:40 +01:00  
				
					
						
							
							
								 
						
							
								7425b2c32e 
								
							 
						 
						
							
							
								
								Add test to ensure plugins are executed in order of priority.  
							
							
							
						 
						
							2013-03-16 15:12:57 +01:00  
				
					
						
							
							
								 
						
							
								9100967ebd 
								
							 
						 
						
							
							
								
								Add unit tests for custom configuration.  
							
							
							
						 
						
							2013-03-16 14:46:26 +01:00  
				
					
						
							
							
								 
						
							
								52efb71aa2 
								
							 
						 
						
							
							
								
								Added directory_with_contents() to DRY up test code and ensure folders exist in TestCommand.  
							
							
							
						 
						
							2013-03-16 14:09:53 +01:00  
				
					
						
							
							
								 
						
							
								d93faac3b8 
								
							 
						 
						
							
							
								
								Rudimentary tests for Jekyll::Command  
							
							
							
						 
						
							2013-03-16 13:59:59 +01:00  
				
					
						
							
							
								 
						
							
								a0c0d983bf 
								
							 
						 
						
							
							
								
								Using a test_dir helper method for tests.  
							
							
							
						 
						
							2013-03-16 13:59:40 +01:00  
				
					
						
							
							
								 
						
							
								92d9c4301b 
								
							 
						 
						
							
							
								
								display single files from gist  
							
							
							
						 
						
							2013-03-15 22:37:14 +00:00  
				
					
						
							
							
								 
						
							
								4be5dfdb9a 
								
							 
						 
						
							
							
								
								fix copying of site template files  
							
							
							
						 
						
							2013-03-13 21:27:41 +00:00  
				
					
						
							
							
								 
						
							
								1ab83ff9e9 
								
							 
						 
						
							
							
								
								fix test to highlight issue with FileUtils.cp_r  
							
							
							
						 
						
							2013-03-13 19:55:15 +00:00  
				
					
						
							
							
								 
						
							
								b306835ce0 
								
							 
						 
						
							
							
								
								Add tests for 'new' command.  
							
							
							
						 
						
							2013-03-12 19:38:05 +01:00  
				
					
						
							
							
								 
						
							
								725b127f9b 
								
							 
						 
						
							
							
								
								Merge pull request  #536  from fotos/fix_page_dir  
							
							... 
							
							
							
							Added path in url. 
							
						 
						
							2013-03-09 17:07:16 -08:00  
				
					
						
							
							
								 
						
							
								22dcc4e20f 
								
							 
						 
						
							
							
								
								Adds excerpt to posts  
							
							
							
						 
						
							2013-03-04 17:13:25 +01:00  
				
					
						
							
							
								 
						
							
								17c875f6f5 
								
							 
						 
						
							
							
								
								Fixed plugin test error.  
							
							
							
						 
						
							2013-03-02 18:51:42 +01:00  
				
					
						
							
							
								 
						
							
								441eddf1ca 
								
							 
						 
						
							
							
								
								Fix pretty url style paths.  
							
							... 
							
							
							
							Ignore the basename if the page is an index page, preserve it if it's just an
html page and use the full path in every other case. 
							
						 
						
							2013-02-28 03:49:39 +02:00  
				
					
						
							
							
								 
						
							
								63d0eef646 
								
							 
						 
						
							
							
								
								Merge pull request  #824  from sinamt/symlinked_folders  
							
							... 
							
							
							
							Allow symlinked folders in unsafe mode (with tests). Closes  #796 , resolves  #233 . 
							
						 
						
							2013-02-26 16:54:52 -08:00  
				
					
						
							
							
								 
						
							
								849c34e913 
								
							 
						 
						
							
							
								
								Add tests for filtering symlink entries when safe mode enabled  
							
							
							
						 
						
							2013-02-27 10:39:46 +11:00  
				
					
						
							
							
								 
						
							
								d58859570d 
								
							 
						 
						
							
							
								
								Fix up the whitespace.  
							
							... 
							
							
							
							Remove an extra blank line and fix another whitespace error pointed out
by git diff 
							
						 
						
							2013-02-25 13:24:37 -06:00  
				
					
						
							
							
								 
						
							
								ffc42310b4 
								
							 
						 
						
							
							
								
								Add back a test that was mistakenly removed.  
							
							
							
						 
						
							2013-02-25 13:19:45 -06:00  
				
					
						
							
							
								 
						
							
								d2c79a8841 
								
							 
						 
						
							
							
								
								Merge branch 'master' into issue-653  
							
							
							
						 
						
							2013-02-25 13:08:23 -06:00  
				
					
						
							
							
								 
						
							
								f8a90d711f 
								
							 
						 
						
							
							
								
								Using https protocol instead of http.  
							
							
							
						 
						
							2013-02-24 01:54:13 +01:00  
				
					
						
							
							
								 
						
							
								cdd3c0ef0c 
								
							 
						 
						
							
							
								
								Remove 'type' attribute from script tag in gist liquid tag.  
							
							
							
						 
						
							2013-02-24 01:30:41 +01:00  
				
					
						
							
							
								 
						
							
								7e7cee6e56 
								
							 
						 
						
							
							
								
								Strip space from the gist number, add test for gist tag  
							
							
							
						 
						
							2013-02-24 00:58:13 +01:00  
				
					
						
							
							
								 
						
							
								a19bb1815a 
								
							 
						 
						
							
							
								
								Fixed merge conflicts in test/test_configuration.rb  
							
							
							
						 
						
							2013-02-20 23:13:06 +01:00  
				
					
						
							
							
								 
						
							
								c7c0a9432c 
								
							 
						 
						
							
							
								
								Updating tests for safe_yaml.  
							
							
							
						 
						
							2013-02-10 19:09:36 +01:00  
				
					
						
							
							
								 
						
							
								9bb0bfc0b2 
								
							 
						 
						
							
							
								
								Eliminating migrator tests (in this repo).  
							
							
							
						 
						
							2013-01-31 01:19:56 +01:00  
				
					
						
							
							
								 
						
							
								2e73671cf4 
								
							 
						 
						
							
							
								
								Updated Kramdown tests to reflect numeral HTML entities.  
							
							
							
						 
						
							2013-01-30 23:25:49 +01:00  
				
					
						
							
							
								 
						
							
								04b60ffe7f 
								
							 
						 
						
							
							
								
								Merge pusewicz/bump-gems from  #744  
							
							
							
						 
						
							2013-01-30 23:20:23 +01:00  
				
					
						
							
							
								 
						
							
								b4bea4a586 
								
							 
						 
						
							
							
								
								Merge branch 'code-cleanup' of git://github.com/tombell/jekyll into code-cleanup  
							
							... 
							
							
							
							Module Cleanup
* 'code-cleanup' of git://github.com/tombell/jekyll:
  Remove new lines between module and class
  Update tag classes moving into a module
  Update pagination classes moving into a module
  Update converter classes moving into a module
  Strip extra newlines
  Update command classes moving into a module
Conflicts:
	lib/jekyll/commands/serve.rb 
							
						 
						
							2013-01-27 23:13:16 +01:00  
				
					
						
							
							
								 
						
							
								409eedafd8 
								
							 
						 
						
							
							
								
								Merge pull request  #767  from mojombo/string-categories  
							
							... 
							
							
							
							Force Categories to be Strings 
							
						 
						
							2013-01-26 13:32:26 -08:00  
				
					
						
							
							
								 
						
							
								d82179048e 
								
							 
						 
						
							
							
								
								adding files  
							
							
							
						 
						
							2013-01-23 11:31:59 -06:00  
				
					
						
							
							
								 
						
							
								1528cfe1cd 
								
							 
						 
						
							
							
								
								adding safe_yaml to protect against object instantiation from yaml  
							
							
							
						 
						
							2013-01-23 11:30:24 -06:00  
				
					
						
							
							
								 
						
							
								607b4c84fd 
								
							 
						 
						
							
							
								
								Only running simplecov if RUBY_VERSION is 1.9 or greater, and COVERAGE env is set to 'true'  
							
							
							
						 
						
							2013-01-20 22:16:23 -05:00  
				
					
						
							
							
								 
						
							
								2c45150545 
								
							 
						 
						
							
							
								
								Update tag classes moving into a module  
							
							
							
						 
						
							2013-01-19 23:50:44 +00:00  
				
					
						
							
							
								 
						
							
								663a1321d2 
								
							 
						 
						
							
							
								
								Update converter classes moving into a module  
							
							
							
						 
						
							2013-01-19 23:07:38 +00:00  
				
					
						
							
							
								 
						
							
								f231ef7644 
								
							 
						 
						
							
							
								
								Merge pull request  #684  from mattr-/issue-680.  
							
							
							
						 
						
							2013-01-18 10:28:14 -05:00  
				
					
						
							
							
								 
						
							
								ce798a5956 
								
							 
						 
						
							
							
								
								Added test for all-String categories.  
							
							
							
						 
						
							2013-01-17 21:57:21 -05:00  
				
					
						
							
							
								 
						
							
								5e08cddb98 
								
							 
						 
						
							
							
								
								filter out test files in coverage results  
							
							
							
						 
						
							2013-01-16 22:27:23 -06:00  
				
					
						
							
							
								 
						
							
								00d74fa53f 
								
							 
						 
						
							
							
								
								Add SimpleCov to the unit tests  
							
							
							
						 
						
							2013-01-16 22:20:34 -06:00  
				
					
						
							
							
								 
						
							
								f460a6cf71 
								
							 
						 
						
							
							
								
								Merge branch 'master' into issue-653  
							
							
							
						 
						
							2013-01-16 21:52:32 -06:00  
				
					
						
							
							
								 
						
							
								e383bfe65d 
								
							 
						 
						
							
							
								
								Merge pull request  #743  from mccxj/master  
							
							... 
							
							
							
							add glob support to include, exclude option 
							
						 
						
							2013-01-12 22:16:07 -08:00