Parker Moore 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
..
bootstrap	Updated the scripts shebang for portability	2015-07-18 22:23:56 -04:00
branding	Updated the scripts shebang for portability	2015-07-18 22:23:56 -04:00
cibuild	script/cibuild: fail if subprocesses fail	2015-12-09 11:46:47 -08:00
console	OMG COLLECTIONS ARE RENDERING CALL THE POLICE	2014-04-14 22:46:21 -04:00
cucumber	Rearrange Cucumber and add some flair.	2016-01-11 14:55:34 -06:00
fmt	script/fmt: print Rubocop version	2016-06-28 12:38:46 -07:00
proof	Fix link issues in the site found by HTML Proofer.	2016-03-01 19:43:22 -08:00
rubies	Only run tests with --profile when using MRI.	2016-06-23 19:08:53 -07:00
rubyprof	Rename incremental regeneration flag	2015-10-26 14:20:44 -07:00
stackprof	script/stackprof: allow CLI to set stackprof mode [ci skip]	2015-12-13 12:21:32 -08:00
test	Only run tests with --profile when using MRI.	2016-06-23 19:08:53 -07:00
travis	Try to cleanup the Gemfile... again.	2016-01-12 06:54:45 -06:00
vendor-mimes	add script to vendor mime types	2015-08-24 16:21:50 -04:00