jekyll

mirror of https://github.com/jekyll/jekyll.git synced 2026-01-28 16:28:05 -05:00

Files

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