Commit Graph

8698 Commits

Author SHA1 Message Date
Max Chadwick c198b08ee8 Add jekyll-pre-commit to plugins list 2017-01-10 22:50:30 -05:00
jekyllbot 4f84b522b5 Update history to reflect merge of #5621 [ci skip] 2017-01-10 12:05:59 -08:00
jekyllbot bf33dc7f50 Merge pull request #5621 from rogerogden/patch-1
Merge pull request 5621
2017-01-10 12:05:58 -08:00
Frank Taillandier 31178bfe69 Merge branch 'master' into liquid-4 2017-01-10 20:01:04 +01:00
Parker Moore 22368896fb
Rearrange some pieces of History.markdown. 2017-01-10 12:17:42 -05:00
Parker Moore faa67bcd62
include: fix 'no implicit conversion of nil to String'
This is when either 'dir' or 'file' is nil.
2017-01-10 12:12:55 -05:00
jekyllbot 0210022c75 Update history to reflect merge of #5746 [ci skip] 2017-01-10 01:46:18 -08:00
jekyllbot 8a02606c09 Merge pull request #5746 from DirtyF/sort-gems
Merge pull request 5746
2017-01-10 01:46:17 -08:00
jekyllbot f785d6f8d1 Update history to reflect merge of #5748 [ci skip] 2017-01-10 01:45:46 -08:00
jekyllbot fe6d772b13 Merge pull request #5748 from yoostk/minor-fix
Merge pull request 5748
2017-01-10 01:45:44 -08:00
Frank Taillandier c48daa9d5b
normalize whitespace 2017-01-10 10:34:16 +01:00
yoostk 4ef69b948c Fix a minor grammatical mistake on themes' document 2017-01-10 15:03:46 +09:00
Frank Taillandier 6748f100d5 Merge branch 'master' into sort-gems 2017-01-09 23:14:21 +01:00
jekyllbot 47550935cb Update history to reflect merge of #5725 [ci skip] 2017-01-09 14:14:03 -08:00
jekyllbot d2eb645386 Merge pull request #5725 from jekyll/pull/assert_nil
Merge pull request 5725
2017-01-09 14:14:01 -08:00
jekyllbot fb83ebadf6 Update history to reflect merge of #5745 [ci skip] 2017-01-09 14:10:03 -08:00
jekyllbot 102ea9eed1 Merge pull request #5745 from DirtyF/rubocop-autocorrect
Merge pull request 5745
2017-01-09 14:10:02 -08:00
Frank Taillandier 335d9b3881 sort gems 2017-01-09 21:39:42 +01:00
Frank Taillandier 10b96b26bc Sort dependencies 2017-01-09 21:39:19 +01:00
Frank Taillandier 8bf9c37cf5 rubocop -a 2017-01-09 21:32:11 +01:00
Frank Taillandier 0c9c236c48 rubocup -a 2017-01-09 21:31:57 +01:00
Frank Taillandier 74e6ef83c9 Use defaults in config
All docs stored in _docs inherit from docs layout
All news items stored in _posts inherit from news-item layout
2017-01-09 21:10:24 +01:00
Frank Taillandier f4ff88adb7 Merge branch 'master' into docs-usage-help 2017-01-09 19:52:06 +01:00
Zlatan Vasović 5ac3e0a866 Fix #5730: add gcc and make to the list of requirements 2017-01-09 17:45:28 +01:00
jekyllbot 86fc58491c Update history to reflect merge of #5473 [ci skip] 2017-01-09 06:36:52 -08:00
jekyllbot 1c4833c5ed Merge pull request #5473 from kentonh/patch-1
Merge pull request 5473
2017-01-09 06:36:51 -08:00
Frank Taillandier e60769731a Report modifications to docs 2017-01-09 15:25:59 +01:00
Kenton Hansen b1291605b3 Changes to 'bundle exec jekyll serve'
Updated to be consistent with the rest of documentation.
2017-01-09 15:19:46 +01:00
Kenton Hansen 8a5672fdff Addition of a sample "typical post"
So, I thought this section in the docs would be a good place to put the anatomy of a post .md file.
2017-01-09 15:19:46 +01:00
jekyllbot 74fe613072 Update history to reflect merge of #5740 [ci skip] 2017-01-09 05:16:12 -08:00
jekyllbot 45ad85b27d Merge pull request #5740 from KAndrsn/patch-1
Merge pull request 5740
2017-01-09 05:16:11 -08:00
Kurt Anderson 0ebc832e1b Remove duplicate paragraph. 2017-01-09 08:01:58 -05:00
Frank Taillandier c3ff3e59fc Merge branch 'master' into fix-broken-links 2017-01-09 00:36:12 +01:00
jekyllbot 5ef6edb977 Update history to reflect merge of #5738 [ci skip] 2017-01-08 14:51:30 -08:00
jekyllbot f26117f3e9 Merge pull request #5738 from Longwelwind/patch-1
Merge pull request 5738
2017-01-08 14:51:30 -08:00
Longwelwind 6cd388b2ab Replace a dead link with a web-archived one 2017-01-08 23:12:45 +01:00
Frank Taillandier 441b275af2 fix broken links in documentation 2017-01-08 16:43:59 +01:00
Frank Taillandier 02a8ce5585 add spaces to variables 2017-01-08 15:15:48 +01:00
jekyllbot dd397b6c4b Update history to reflect merge of #5696 [ci skip] 2017-01-08 06:06:08 -08:00
jekyllbot 0bc4f2a28f Merge pull request #5696 from tomjohnson1492/patch-11
Merge pull request 5696
2017-01-08 06:06:08 -08:00
jekyllbot 0f9a4ac072 Update history to reflect merge of #5692 [ci skip] 2017-01-08 06:02:31 -08:00
jekyllbot 7df1adb4f8 Merge pull request #5692 from tomjohnson1492/patch-6
Merge pull request 5692
2017-01-08 06:02:30 -08:00
Frank Taillandier 234ed44db6 Fix format, corrections 2017-01-08 14:44:59 +01:00
jekyllbot 61e5aa7728 Update history to reflect merge of #5544 [ci skip] 2017-01-08 04:50:02 -08:00
jekyllbot 60a2396832 Merge pull request #5544 from jekyll/revert-5532-perma-docs
Merge pull request 5544
2017-01-08 04:50:01 -08:00
Frank Taillandier 870a57316c Merge branch 'master' into revert-5532-perma-docs 2017-01-08 13:38:05 +01:00
jekyllbot e126d16135 Update history to reflect merge of #5726 [ci skip] 2017-01-07 03:37:48 -08:00
jekyllbot 214eedc87b Merge pull request #5726 from jekyll/pull/remove-deprecated
Merge pull request 5726
2017-01-07 03:37:47 -08:00
Pat Hawks 203be72c47
Remove unnecessary "rubocop:enable" 2017-01-06 05:57:21 -06:00
Pat Hawks 368294b2a9
Update tests to be position independent 2017-01-06 05:55:50 -06:00