Commit Graph

  • 658f827d17 Merge pull request #5810 from jhabdas/jekyll-money jekyllbot 2017-01-22 12:00:28 -0500
  • f7186c86c4
    Got that diaper money? Josh Habdas 2017-01-22 22:33:21 +0800
  • eb54e270f9 Added note about --blank flag Ajay Karwal 2017-01-21 00:17:14 +0000
  • 9fe73be101 Update history to reflect merge of #5797 [ci skip] jekyllbot 2017-01-20 13:59:19 -0500
  • cf606191ee Merge pull request #5797 from DirtyF/bump-rdoc jekyllbot 2017-01-20 13:59:18 -0500
  • 12201d4f1b
    update excluded paths Frank Taillandier 2017-01-20 09:49:34 +0100
  • 4804806266 Update history to reflect merge of #5799 [ci skip] jekyllbot 2017-01-20 03:42:02 -0500
  • a6b9482abd Merge pull request #5799 from sparanoid/patch-2 jekyllbot 2017-01-20 03:42:00 -0500
  • 4ed4c43044 Add `match_regex` and `replace_regex` filters Tunghsiao Liu 2017-01-20 15:14:23 +0800
  • 5ed22d0b3e
    Now we must execute SimpleCov Frank Taillandier 2017-01-19 22:39:39 +0100
  • 6ec2145c0c
    bump codeclimate-test-reporter to v1.0.5 Frank Taillandier 2017-01-19 22:15:07 +0100
  • 63dfe080db
    bump rdoc to v5.0 Frank Taillandier 2017-01-19 22:06:37 +0100
  • 84e9ea82d1 Merge branch 'master' into patch-1 Frank Taillandier 2017-01-19 18:12:05 +0100
  • 60ba3fc0c9 Update history to reflect merge of #5736 [ci skip] jekyllbot 2017-01-19 08:55:04 -0500
  • 4697ddabec Merge pull request #5736 from DirtyF/fix-broken-links jekyllbot 2017-01-19 08:55:02 -0500
  • 02f092809a Merge branch 'master' into fix-broken-links Frank Taillandier 2017-01-19 14:14:12 +0100
  • b7f44e6eca
    Queue up a 3.4 deploy with unfinished release post. Parker Moore 2017-01-18 16:54:21 -0500
  • b2d93913d0 Update history to reflect merge of #5694 [ci skip] jekyllbot 2017-01-18 15:36:13 -0500
  • 036d447f68 Merge pull request #5694 from tomjohnson1492/patch-8 jekyllbot 2017-01-18 15:36:11 -0500
  • b6bc85ec7c
    Correct 2 Style/TrailingCommaInLiteral rubocop offenses in test_filters.rb Parker Moore 2017-01-18 14:16:08 -0500
  • 0599c22425 Update history to reflect merge of #5640 [ci skip] jekyllbot 2017-01-18 14:15:13 -0500
  • 477b2f0f3e Merge pull request #5640 from jekyll/jekyll-utils-exec jekyllbot 2017-01-18 14:15:11 -0500
  • 402eb0dfa5 Update history to reflect merge of #5542 [ci skip] jekyllbot 2017-01-17 20:21:49 -0500
  • 76e9b8d266 Merge pull request #5542 from ashmaroli/url-slash jekyllbot 2017-01-17 20:21:48 -0500
  • 0b4a097a40 Update history to reflect merge of #5753 [ci skip] jekyllbot 2017-01-17 20:20:36 -0500
  • 20c6aec88f Merge pull request #5753 from DirtyF/docs-merge-categories jekyllbot 2017-01-17 20:20:35 -0500
  • a9c7e14d60 Update history to reflect merge of #5780 [ci skip] jekyllbot 2017-01-17 18:59:39 -0500
  • b5d1be4dcf Merge pull request #5780 from jekyll/dont-include-in-load-path-if-nil jekyllbot 2017-01-17 18:59:38 -0500
  • 2c19264d08
    Add a philosophy doc. Parker Moore 2017-01-17 18:51:49 -0500
  • 130159dda4
    Fix rubocop error. Parker Moore 2017-01-17 17:05:14 -0500
  • 023476049b
    Remove superfluous self. Parker Moore 2017-01-17 16:21:28 -0500
  • e0d63c8aa9
    Add test to ensure that if the includes dir isn't in the theme that it won't break the site Parker Moore 2017-01-17 16:19:47 -0500
  • ad8fb9b927
    Add theme_dir() helper func Parker Moore 2017-01-17 16:19:26 -0500
  • 2052280ccd Update history to reflect merge of #5791 [ci skip] jekyllbot 2017-01-17 14:56:00 -0500
  • aa9cb1524c Merge pull request #5791 from DirtyF/fix-note jekyllbot 2017-01-17 14:55:59 -0500
  • e1f4d92d02
    add missing class Frank Taillandier 2017-01-17 18:22:28 +0100
  • 39c4054cd1 Update history to reflect merge of #5784 [ci skip] jekyllbot 2017-01-17 04:34:19 -0500
  • 3a9cb90a08 Merge pull request #5784 from ashmaroli/bump-rvm jekyllbot 2017-01-17 04:34:18 -0500
  • bfb6cf1ca9 bump rubies Ashwin Maroli 2017-01-17 14:35:33 +0530
  • b9dedb3477 Update history to reflect merge of #5312 [ci skip] jekyllbot 2017-01-17 03:34:05 -0500
  • 321364e3cc Merge pull request #5312 from DirtyF/docs-usage-help jekyllbot 2017-01-17 03:34:04 -0500
  • 492a510538 Merge branch 'master' into docs-usage-help Frank Taillandier 2017-01-17 09:32:48 +0100
  • 9c72903395 Update history to reflect merge of #5781 [ci skip] jekyllbot 2017-01-17 03:24:08 -0500
  • 8d4cce9335 Merge pull request #5781 from DirtyF/bump-htmlproofer jekyllbot 2017-01-17 03:24:06 -0500
  • 4ea770e995 Update history to reflect merge of #5782 [ci skip] jekyllbot 2017-01-17 03:22:44 -0500
  • 5d5b24d3d1 Merge pull request #5782 from DirtyF/bump-jemoji jekyllbot 2017-01-17 03:22:43 -0500
  • 5460e71176 Update history to reflect merge of #5731 [ci skip] jekyllbot 2017-01-16 21:48:20 -0500
  • bf7e24cc99 Merge pull request #5731 from zdroid/gcc-make jekyllbot 2017-01-16 21:48:19 -0500
  • 67ab159606 Update history to reflect merge of #5691 [ci skip] jekyllbot 2017-01-16 21:38:56 -0500
  • 16d71b1f4b Merge pull request #5691 from tomjohnson1492/patch-5 jekyllbot 2017-01-16 21:38:55 -0500
  • c39414a17b
    use latest jemoji gem Frank Taillandier 2017-01-17 02:59:57 +0100
  • cd8836cf6e bump htmlproofer Frank Taillandier 2017-01-17 02:34:15 +0100
  • 9a5307c3f9
    Don't include the theme's includes_path if it is nil. Parker Moore 2017-01-16 19:17:45 -0500
  • e509cf2139 Update history to reflect merge of #5767 [ci skip] jekyllbot 2017-01-16 18:38:35 -0500
  • 6c4699bd54 Merge pull request #5767 from Crunch09/issue-5756 jekyllbot 2017-01-16 18:38:34 -0500
  • 448b6ba08e Update history to reflect merge of #5779 [ci skip] jekyllbot 2017-01-16 17:03:42 -0500
  • 71dab94a97 Merge pull request #5779 from jekyll/fix-flaky-plugins-path-test jekyllbot 2017-01-16 17:03:41 -0500
  • aa7e47a30d
    Remove calls to Dir.chdir without a block. Parker Moore 2017-01-16 16:43:25 -0500
  • 567a7952dd
    test/helper: fix flaky plugin path test by initializing Configuration::DEFAULTS at start of tests Parker Moore 2017-01-16 16:25:09 -0500
  • 9d70bbba44 Update history to reflect merge of #5768 [ci skip] jekyllbot 2017-01-16 16:00:07 -0500
  • 750fb32ca3 Merge pull request #5768 from DirtyF/rubocop-47 jekyllbot 2017-01-16 16:00:06 -0500
  • 036dd3ccc9 Update history to reflect merge of #5769 [ci skip] jekyllbot 2017-01-16 11:05:25 -0500
  • 941e8f85dd Merge pull request #5769 from diev/patch-1 jekyllbot 2017-01-16 11:05:24 -0500
  • 55993c6c5d Fix a markdown link to look properly on the web Dmitrii Evdokimov 2017-01-16 17:53:04 +0300
  • d790477d6d Add security rules Frank Taillandier 2017-01-16 10:43:07 +0100
  • a30d81ceb8 bump Rubocop to v47 Frank Taillandier 2017-01-16 10:26:08 +0100
  • ecd04badf0 throw IncludeTagError if error occurs in included file Florian Thomas 2017-01-15 20:35:10 +0100
  • becdcb5164 Update history to reflect merge of #5765 [ci skip] jekyllbot 2017-01-15 03:47:06 -0500
  • 057365a578 Merge pull request #5765 from jekyll/bump-rubocop jekyllbot 2017-01-15 03:47:05 -0500
  • 6f8bf2e950 appease rubocop Frank Taillandier 2017-01-14 20:11:30 +0100
  • 39b7af3732 exclude rake tasks and gemspec from metrics Frank Taillandier 2017-01-14 20:05:11 +0100
  • 5d52074d2d appease Rubocop Frank Taillandier 2017-01-14 20:01:41 +0100
  • 44324828b4 bump Rubocop to latest version Frank Taillandier 2017-01-14 20:00:36 +0100
  • 7d5f961dba Update history to reflect merge of #5764 [ci skip] jekyllbot 2017-01-14 07:41:25 -0500
  • da6830f021 Merge pull request #5764 from purplecarrot/patch-1 jekyllbot 2017-01-14 07:41:24 -0500
  • 59cbdf5935 Correct minor typo Purplecarrot 2017-01-14 10:36:55 +0000
  • b9ae94387f Update history to reflect merge of #5750 [ci skip] jekyllbot 2017-01-14 00:01:33 -0500
  • aa63deb2a9 Merge pull request #5750 from jekyll/no-implicit-conversion-of-nil-to-string jekyllbot 2017-01-14 00:01:31 -0500
  • a66fd1fa04 Update history to reflect merge of #5758 [ci skip] jekyllbot 2017-01-13 04:59:14 -0500
  • b8957ab607 Merge pull request #5758 from BlueberryFoxtrot/patch-2 jekyllbot 2017-01-13 04:59:12 -0500
  • 6d9633e364 making edits from reviews Tom Johnson 2017-01-12 23:28:56 -0800
  • 7efeb3d4af made updates as requested from latest review Tom Johnson 2017-01-12 23:03:56 -0800
  • 27ed81547b Update history to reflect merge of #5761 [ci skip] jekyllbot 2017-01-12 16:41:16 -0800
  • 76410d16d1 Merge pull request #5761 from jekyll/pull/consistent_comma jekyllbot 2017-01-12 16:41:15 -0800
  • 1d885911bc
    Rubocop: Require consistent comma in multiline literals Pat Hawks 2017-01-12 17:52:29 -0600
  • 2fc4fdfe79 Update quickstart.md BlueberryFoxtrot 2017-01-12 17:39:21 +0100
  • 335c8fcf62 Update installation.md BlueberryFoxtrot 2017-01-12 17:28:32 +0100
  • 538cff15e9 report @parkr feedback Frank Taillandier 2017-01-11 20:57:34 +0100
  • 8ae2673eba Update history to reflect merge of #5744 [ci skip] jekyllbot 2017-01-11 09:13:39 -0800
  • 9b71cf7556 Merge pull request #5744 from DirtyF/pull/docs-use-defaults jekyllbot 2017-01-11 09:13:38 -0800
  • 02858fdf08 include: improve boolean logic in #valid_include_file? Parker Moore 2017-01-11 12:05:56 -0500
  • d77ed5e608
    Add missing merge labels for jekyllbot Frank Taillandier 2017-01-11 10:49:21 +0100
  • 07d161c2ce Update history to reflect merge of #5752 [ci skip] jekyllbot 2017-01-11 01:42:10 -0800
  • fb450630ef Merge pull request #5752 from mpchadwick/jekyll-pre-commit jekyllbot 2017-01-11 01:42:08 -0800
  • c198b08ee8 Add jekyll-pre-commit to plugins list Max Chadwick 2017-01-10 22:50:30 -0500
  • 4f84b522b5 Update history to reflect merge of #5621 [ci skip] jekyllbot 2017-01-10 12:05:59 -0800
  • bf33dc7f50 Merge pull request #5621 from rogerogden/patch-1 jekyllbot 2017-01-10 12:05:58 -0800
  • 31178bfe69 Merge branch 'master' into liquid-4 Frank Taillandier 2017-01-10 20:01:04 +0100
  • 22368896fb
    Rearrange some pieces of History.markdown. Parker Moore 2017-01-10 12:17:42 -0500
  • faa67bcd62
    include: fix 'no implicit conversion of nil to String' Parker Moore 2017-01-10 12:12:55 -0500