Commit Graph

6916 Commits

Author SHA1 Message Date
Ben Balter e3c71ea407 Merge branch 'master' into themes 2016-03-11 14:44:44 -05:00
Ben Balter 1a203a0598 use variables in the docs 2016-03-11 14:43:44 -05:00
Ben Balter 92168954d2 remove asset support 2016-03-11 14:41:26 -05:00
jekyllbot e92a46e156 Update history to reflect merge of #4653 [ci skip] 2016-03-11 13:35:23 -06:00
jekyllbot 2ea3bc53d3 Merge pull request #4653 from mlinksva/patch-2
Merge pull request 4653
2016-03-11 13:35:22 -06:00
jekyllbot c206df3401 Update history to reflect merge of #4652 [ci skip] 2016-03-11 13:14:53 -06:00
jekyllbot d4c1d97cb3 Merge pull request #4652 from jekyll/clean-sass-cache
Merge pull request 4652
2016-03-11 13:14:52 -06:00
Mike Linksvayer 4948b5a3b3 change smartify doc from copy/paste of mardownify doc 2016-03-11 11:09:03 -08:00
Parker Moore 79f8210fff 'jekyll clean': also remove .sass-cache 2016-03-11 10:04:36 -08:00
jekyllbot 8c9ebd2674 Update history to reflect merge of #4645 [ci skip] 2016-03-11 11:37:35 -06:00
jekyllbot 1768bcc489 Merge pull request #4645 from jekyll/affinity-teams-post
Merge pull request 4645
2016-03-11 11:37:35 -06:00
Parker Moore 86e4fa9a35 team ~> teams 2016-03-11 09:37:11 -08:00
Ben Balter b086a3b423 Merge pull request #4646 from jekyll/avatar-fix
Ensure avatars properly render on /news
2016-03-10 11:59:37 -05:00
Ben Balter 1c59be1494 ensure avatars properly render on /news 2016-03-10 11:52:39 -05:00
Ben Balter c759771dc7 super-duper informal 2016-03-10 11:47:53 -05:00
Ben Balter 238341ac8a steel my awesome one contribution at a time line from the contributing file 2016-03-10 11:47:02 -05:00
Ben Balter 21847980e3 more informal link language 2016-03-10 11:46:06 -05:00
Ben Balter b4ca9a56fe dont list the teams 2016-03-10 11:45:43 -05:00
Ben Balter 3403a76ec8 todays the 10th, not the 11th 2016-03-10 11:44:57 -05:00
Ben Balter 61e549d317 link to affinity teams on firt reference 2016-03-10 11:44:40 -05:00
Ben Balter 2240d52338 add post on contributing file and affinity teams 2016-03-10 11:42:48 -05:00
Parker Moore 3acf4beb81 Rakefile: siteify_file should allow overrides from task [ci skip] 2016-03-10 10:21:15 -06:00
Parker Moore 0f8a3b2971 Proper contributing file in site/.
Hello, friends. I have an update for you because i derp'd. [ci skip]
2016-03-10 10:16:10 -06:00
jekyllbot d2fd910828 Update history to reflect merge of #4596 [ci skip] 2016-03-10 10:10:37 -06:00
jekyllbot a068bfb8ee Merge pull request #4596 from jekyll/contributing-refresh
Merge pull request 4596
2016-03-10 10:10:37 -06:00
Ben Balter a3577d953d refresh contributing doc 2016-03-10 10:09:53 -06:00
jekyllbot 40a5e5c60c Update history to reflect merge of #4628 [ci skip] 2016-03-09 11:19:59 -08:00
jekyllbot 9e57eb1858 Merge pull request #4628 from mejackreed/travis-sudo
Merge pull request 4628
2016-03-09 11:19:58 -08:00
Jack Reed 0f50dd1bb7 Update continuous-integration docs with sudo: false information
Updates the continuous-integration docs to provide information about the `sudo: false` behavior which can route builds to the faster container-based infrastructure. https://docs.travis-ci.com/user/workers/container-based-infrastructure/#Routing-your-build-to-container-based-infrastructure
2016-03-09 09:36:02 -05:00
jekyllbot a93c3eadd1 Update history to reflect merge of #4555 [ci skip] 2016-03-08 16:25:16 -08:00
jekyllbot 9e0ed00a59 Merge pull request #4555 from timwis/patch-1
Merge pull request 4555
2016-03-08 16:25:15 -08:00
Parker Moore a1835c0a31 Fix rakefile when you don't have a title in markdown 2016-03-08 16:46:17 -06:00
Parker Moore c49d1fc1bd Collections is settled as of Jekyll v3 2016-03-08 16:42:01 -06:00
Matt Rogers 3129372d12 Update history to reflect merge of #4639 [ci skip] 2016-03-08 16:13:43 -06:00
Matt Rogers faf06d1969 Merge pull request #4639 from anthonyjsmith/patch-1 2016-03-08 16:13:40 -06:00
Matt Rogers d912f3a456 Update history to reflect merge of #4636 [ci skip] 2016-03-08 16:04:29 -06:00
Matt Rogers 9520d9bbf9 Merge pull request #4636 from HugoGiraudel/patch-4 2016-03-08 16:04:02 -06:00
Ben Balter b29ce257c3 fix for history file title 2016-03-08 12:08:22 -05:00
Ben Balter 78acdc72e2 fix for history not having a title 2016-03-08 12:03:22 -05:00
Ben Balter 678d494d90 no GFM for you 2016-03-08 12:03:14 -05:00
Ben Balter eb341514a7 use def_delegator 2016-03-08 11:55:16 -05:00
Ben Balter e8617cf7cd better theme-not-found handling 2016-03-08 11:53:29 -05:00
Ben Balter ea84ac9b04 use rocket hashes 2016-03-08 11:52:33 -05:00
Ben Balter 06ee9bcff4 remove title of history file 2016-03-08 11:52:17 -05:00
jekyllbot ce3ea138ce Update history to reflect merge of #4558 [ci skip] 2016-03-08 06:22:13 -08:00
jekyllbot 85685a8981 Merge pull request #4558 from zandaleph/log-future
Merge pull request 4558
2016-03-08 06:22:13 -08:00
Zack Spencer 13912482ad Adding a debug log statment for skipped future posts.
For https://github.com/jekyll/jekyll/issues/4507
2016-03-07 22:10:10 +00:00
jekyllbot 3213ea70e5 Update history to reflect merge of #4641 [ci skip] 2016-03-07 13:56:51 -08:00
jekyllbot 24da7f8883 Merge pull request #4641 from alexpls/patch-1
Merge pull request 4641
2016-03-07 13:56:51 -08:00
Ben Balter c86fba6fb3 use /assets for theme assets, not _assets 2016-03-06 15:42:08 -05:00