Commit Graph

6295 Commits

Author SHA1 Message Date
Parker Moore 645a2cc664 test/test_doctor_command.rb: fix test for Doctor.urls_only_differ_by_case 2015-12-14 20:59:52 -08:00
Parker Moore 595ad56a7e Update history to reflect merge of #4263
[ci skip]
2015-12-14 20:26:08 -08:00
Parker Moore be06296595 Merge pull request #4263 from qrush/doctor-to-jekyll
Merge pull request 4263
2015-12-14 20:24:48 -08:00
Nick Quaranto 115926fd54 Change TestDoctorCommand to JekyllUnitTest since Test constant doesn't necessarily exist 2015-12-14 21:58:36 -05:00
Parker Moore fb8bf7bab6 Update history to reflect merge of #3171
[ci skip]
2015-12-13 12:26:58 -08:00
Parker Moore fdcd761313 Merge branch 'akoeplinger-doctor-permalink-same-case-warning'
* akoeplinger-doctor-permalink-same-case-warning:
  Added tests for new jekyll doctor warning
  Incorporate code review feedback
  Incorporate code review feedback
  Add a Jekyll doctor warning for URLs that only differ by case
2015-12-13 12:26:07 -08:00
Parker Moore 2c5a5e76ec script/stackprof: allow CLI to set stackprof mode [ci skip] 2015-12-13 12:21:32 -08:00
Jordon Bedwell 02b8e326ed [CI:SKIP] Update history.markdown to reflect the merger of #4259. 2015-12-13 08:09:44 -06:00
Jordon Bedwell 366a1d8979 Merge pull request #4259 from itsdn/patch-1
Fix checklist in _assets.md
2015-12-13 08:08:42 -06:00
Dan K 05924bae5e Fix checklist in _assets.md 2015-12-13 16:52:35 +03:00
Parker Moore 763702d4ff Merge pull request #4255 from ofalvai/patch-1
Upgrading 2-3: Added missing links to Pygments.rb and Rouge
2015-12-12 10:08:04 -08:00
Olivér Falvai e61e93b486 Added missing links to Pygments.rb and Rouge 2015-12-12 15:08:12 +01:00
Parker Moore b9d4419749 Merge pull request #4048 from chrisfinazzo/grammar-fixes
Typos and line wrapping
2015-12-11 14:12:16 -08:00
Parker Moore 9e5b1c9f6a Update history to reflect merge of #4052
[ci skip]
2015-12-11 14:11:40 -08:00
Parker Moore 92adfd0e46 Merge pull request #4052 from Crunch09/process-empty-config-files
Merge pull request 4052
2015-12-11 14:11:11 -08:00
Parker Moore b94800361b Collection: change missing_method message to be a bit clearer.
Fixes #4234. Fixes #4199.
2015-12-11 14:07:34 -08:00
Parker Moore dfa3f8b33a Update history to reflect merge of #4184
[ci skip]
2015-12-11 14:03:05 -08:00
Parker Moore 4f21458b34 Merge pull request #4184 from ducktyper/allow-quoted-dates
Merge pull request 4184
2015-12-11 14:02:55 -08:00
Parker Moore 29e721a804 Update history to reflect merge of #4251
[ci skip]
2015-12-10 15:59:05 -08:00
Parker Moore ce0bd80527 Merge pull request #4251 from mneumegen/mneumegen-draft-post-docs
Merge pull request 4251
2015-12-10 15:58:47 -08:00
Mike Neumegen ed41ff7774 Updated configuration docs
Added configuration options for draft_posts to configuration docs.
2015-12-10 13:40:53 -08:00
Jordon Bedwell b79c172921 E-Mail on test failure since I'm not often in IRC. 2015-12-10 15:02:24 -06:00
Parker Moore fceddca1b2 Update history to reflect merge of #4249
[ci skip]
2015-12-10 11:11:13 -08:00
Parker Moore 6ddcc7f63a Merge pull request #4249 from brioscaibriste/patch-1
Merge pull request 4249
2015-12-10 11:10:35 -08:00
Conor O'Callaghan 961c807c72 Removed example Roger Chapman site
Page not found for this demo site
2015-12-10 17:24:17 +00:00
Parker Moore 2b6b7b6a9f Merge pull request #4244 from r00k/patch-2
Add utm params to link in docs
2015-12-09 13:42:49 -08:00
Ben Orenstein f97a48d970 Add utm params to link in docs
https://github.com/jekyll/jekyll/pull/4243 updated this link to a jekyll-specific page. This commit adds utm params to the link so we can tell that users came to us from the Jekyll documentation. Among other things, this will help us provide better support to Jekyll users who sign up, since we'll know what site generator they're using.
2015-12-09 16:28:25 -05:00
Parker Moore e8b1a8aa44 script/cibuild: fail if subprocesses fail 2015-12-09 11:46:47 -08:00
Parker Moore 6a4c8a0b1c Update history to reflect merge of #4243
[ci skip]
2015-12-09 11:14:01 -08:00
Parker Moore be032c54fb Merge pull request #4243 from r00k/patch-1
Merge pull request 4243
2015-12-09 11:13:22 -08:00
Ben Orenstein c9ead955a4 Link to less generic FormKeep page
This link used to point to a generic landing page. Now it links to a guide written specifically for Jekyll users.
2015-12-09 13:44:45 -05:00
Parker Moore eadbf2a711 Update history to reflect merge of #4233
[ci skip]
2015-12-07 22:11:43 -08:00
Parker Moore 11959ab2bc Merge pull request #4233 from RochesterinNYC/patch-1
Merge pull request 4233
2015-12-07 22:10:09 -08:00
James Wen 0e89e80426 Switch PluginManager to use require_with_graceful_fail
* Add debug statement specifying current plugin to External#require_with_graceful_fail
2015-12-07 20:46:07 -05:00
Parker Moore f4fa2e735e Update history to reflect merge of #4231
[ci skip]
2015-12-07 09:58:46 -08:00
Parker Moore 7f9fd11a35 Merge pull request #4231 from jekyll/pull/add-default-charset-to-webrick-cleanup-servlet
Merge pull request 4231
2015-12-07 09:58:34 -08:00
Jordon Bedwell 915d8adb1b [CI:SKIP] Update Gemnasium URL. 2015-12-07 11:37:37 -06:00
Jordon Bedwell 643ae68912 Add a default charset to content-type on webrick.
Add a default charset to content-type on webrick, using Jekyll's
default encoding (or user set encoding) and cleanup servlet removing
unecessary logic that really served no purpose at the end of the
day, we don't need to strictly match Nginx, only be "like it."

This also cleans up the way we set headers and merges that logic
into a cleaner to understand interface that is slightly speedier.
2015-12-06 20:33:53 -06:00
Jordon Bedwell fdf12efde4 [CI:SKIP] Update history.markdown to reflect the merger of #4228 2015-12-05 04:54:34 -06:00
Jordon Bedwell 68d58f4183 Merge pull request #4228 from jekyll/pull/fix-file-edge-servlet
Fix an edge where file is sometimes not returned properly.
2015-12-05 04:53:47 -06:00
Jordon Bedwell b63712e403 Fix an edge where file is sometimes not returned properly. 2015-12-05 04:48:51 -06:00
Ducksan Cho 99042fa870 Improve error message 2015-12-05 16:21:50 +13:00
Parker Moore 79ceb4d394 Update history to reflect merge of #4223
[ci skip]
2015-12-04 14:12:59 -08:00
Parker Moore c6255d5f28 Merge pull request #4223 from jekyll/pull/sample-filter
Merge pull request 4223
2015-12-04 14:12:18 -08:00
Parker Moore 47d2a2459d filters: refactor #sample to leave off the arg 2015-12-04 13:48:09 -08:00
Parker Moore dd971a3581 Update history to reflect merge of #4224
[ci skip]
2015-12-04 13:16:40 -08:00
Parker Moore 313582f06d Merge pull request #4224 from jekyll/pull/cleanup-and-modernize-serve-cmd
Merge pull request 4224
2015-12-04 13:16:13 -08:00
Jordon Bedwell 8efbdc01ff Fix #3791/#3478
* Add support for SSL through command line switches.
* Add suppport for file/index.html > file.html > directory.
* Add support for custom-headers through configuration.
* Modernize and split up the serve.
* Add a few basic tests.
2015-12-04 14:07:07 -06:00
Parker Moore a43d2907c7 travis: fast finish. don't wait for allowed failures to finish. JRUBY... 2015-12-04 10:48:25 -08:00
Parker Moore 2e91d094e5 filters#sample: n == 1, return item; n > 1, return array 2015-12-04 10:25:13 -08:00