Commit Graph

2211 Commits

Author SHA1 Message Date
Matt Rogers d40e7942c5 Update history to reflect merge of #1389 2013-08-18 10:59:11 -05:00
Matt Rogers 820f526569 Merge pull request #1389 from mojombo/doctor-conflicting-permalinks
Implement URL conflict checking in `jekyll-doctor`.
2013-08-18 08:57:49 -07:00
Parker Moore 8b8fa4da4e Use Doctor#healthy? and ensure _all_ items are checked before process quits. 2013-08-17 15:16:14 -04:00
Parker Moore ac4ca1edc3 Replace defunked mailing list link with info on IRC room. 2013-08-16 11:56:36 -04:00
Parker Moore 751ed0ab58 Update history to reflect fixing of #1424. 2013-08-16 11:56:07 -04:00
Parker Moore 6f933dc524 Fix link to contributing page in README. Fixes #1424. 2013-08-16 11:55:03 -04:00
Parker Moore c261eeaf6f Update history to reflect merge of #1415 2013-08-14 03:34:17 +02:00
Parker Moore 33ac6519b0 Merge pull request #1415 from mojombo/full-path-output-for-liquid-exception
When a Liquid Exception is caught, show the full path (rel to site source)
2013-08-13 18:33:26 -07:00
Matt Rogers cb57ede320 Update history to reflect merge of #1418 2013-08-13 19:36:59 -05:00
Matt Rogers 894ae74619 Merge pull request #1418 from nfagerlund/docs_redcarpet
Docs: Explain what goes into the redcarpet: extensions: array
2013-08-13 17:34:43 -07:00
Matt Rogers b039aadec0 Update history to reflect merge of #1419 2013-08-13 19:24:06 -05:00
Matt Rogers cb95e25d3f Merge pull request #1419 from penibelst/typo-apostrophe
Update curly apostrophes in documentation
2013-08-13 17:23:18 -07:00
Anatol Broder 00285411eb Update curly apostrophes 2013-08-13 22:56:04 +02:00
Nick Fagerlund 6f22c83249 Docs: Explain what goes into the redcarpet: extensions: array
- Document the two secret-sauce extensions that Jekyll adds, which don't seem to
  be mentioned elsewhere.
- Link to the Redcarpet documentation for other extensions.
- Mention the three or so most common extensions.
- Mention that Redcarpet 2.2.2 lacks several extensions that were added later.
2013-08-13 13:50:56 -07:00
Parker Moore 46f9fe545c Update history to reflect merge of #1411 2013-08-13 17:11:57 +02:00
Parker Moore fd06fd9dd7 Merge pull request #1411 from penibelst/master
Correct internal links
2013-08-13 08:11:00 -07:00
Parker Moore 5f4efd34bd When a Liquid Exception is caught, show the full path (rel to site source) 2013-08-12 21:19:54 +02:00
Anatol Broder 9e0e6a721c Correct section links 2013-08-12 19:11:04 +02:00
Anatol Broder d7b5c40901 Correct internal links 2013-08-11 15:09:23 +02:00
Parker Moore a5b035ece8 Update history to reflect merge of #963 2013-08-11 12:52:24 +02:00
Parker Moore 9e11a7f35f Fix date format in permalink.features. 2013-08-11 12:40:28 +02:00
Parker Moore d4300be758 Merge branch 'permalink-no-dir' of git://github.com/maul-esel/jekyll into maul-esel-permalink-no-dir
* 'permalink-no-dir' of git://github.com/maul-esel/jekyll:
  test per-post permalinks
  do not force the permalink to be a dir if it ends on .html

Conflicts:
	features/step_definitions/jekyll_steps.rb
2013-08-11 12:08:56 +02:00
Parker Moore 4c4a0ca246 Update history to reflect merge of #1408 2013-08-11 12:04:52 +02:00
Parker Moore b46f22860c Merge pull request #1408 from penibelst/master
Update dummy email address to example.com domain. Fix #1406
2013-08-11 03:03:51 -07:00
Anatol Broder affffb4ed4 Update dummy email address to example.com domain 2013-08-10 15:29:33 +02:00
Matt Rogers 8d23046524 Update history to reflect merge of #1400 2013-08-09 22:23:44 -05:00
Matt Rogers 18a6cb0478 Merge pull request #1400 from penibelst/patch-1
Correct the social dummy URLs
2013-08-09 20:22:38 -07:00
Anatol Broder 381a8148e3 Correct the social dummie URLs
Twitter and Github seem to always force HTTPS. They don’t use backslashes after the username.
2013-08-09 17:09:24 +02:00
Parker Moore 7d26be5102 Call ruby's 'abort' if the site is unhealthy 2013-08-08 18:33:55 +02:00
Parker Moore 318a379747 Nuke comment. 2013-08-08 18:32:13 +02:00
Parker Moore b3e3d8a734 Update history to reflect merge of #1386 2013-08-08 11:41:03 +02:00
Parker Moore bc3dccf0e5 Merge pull request #1386 from mojombo/disable-excerpts
Disable automatically-generated excerpts with option
2013-08-08 02:39:06 -07:00
Parker Moore bad5ea55d1 Update history to reflect merge of #1397 2013-08-08 11:15:34 +02:00
Parker Moore 3703bde3b1 Merge pull request #1397 from nfagerlund/error_187_undefined_method_encoding_for_mailto
Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and Kramdown > 0.14.0
2013-08-08 02:14:36 -07:00
Nick Fagerlund 9ca7f70d70 Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and Kramdown > 0.14.0
When using Ruby 1.8.7 and Kramdown 0.14.0 and newer, the following build error
would occur if any page in your site contained a `<name@example.com>` email
address link:

Generating...   Conversion error: There was an error converting 'contribute.markdown'.
/Users/nick/Documents/puppet-docs/vendor/bundle/ruby/1.8/gems/kramdown-1.0.2/lib/kramdown/converter/html.rb:404:in `obfuscate': undefined method `encoding' for "mailto":String (NoMethodError)

See also:
http://rubyforge.org/tracker/index.php?func=detail&aid=29750&group_id=7403&atid=28673

This problem traced back to the following line in the Kramdown source:

result.force_encoding(text.encoding) if result.respond_to?(:force_encoding)

Strings aren't supposed to respond to the :force_encoding method in Ruby < 1.9,
but lib/jekyll/core_ext.rb was modifying the string class like so:

def force_encoding(enc)
  self
end

Strings still won't respond to :encoding, though, so we get an error when
Kramdown tries to read the incoming encoding and everything will blow up.

An ack of the codebase suggests that this was only added so we could force an
encoding for rdiscount on 1.9 without having to check whether we were running
under 1.8. Since testing for said method to learn whether one is running under a
1.9-like encoding regime seems to be a thing in libraries we rely on, we
shouldn't insert this dummy method without also dummying every other part of the
Ruby 1.9+ encoding system.

This commit removes the dummy :force_encoding method to stop poisoning core
classes for libraries we use, and moves the adjustment for 1.9-like encoding
regimes to the one place where it's needed.
2013-08-07 20:07:54 -07:00
Matt Rogers 3c12495b00 Add test for disabled excerpts 2013-08-07 20:22:32 -05:00
Parker Moore 95534733ed should_generate_excerpt? ~> generate_excerpt? 2013-08-08 00:35:42 +02:00
Parker Moore a87d6f9ddd Update history to reflect merge of #1390 2013-08-08 00:29:34 +02:00
Parker Moore cb52535c03 Merge pull request #1390 from mojombo/better-errors
Catch and fix (somehow) common configuration errors
2013-08-07 15:28:16 -07:00
Parker Moore 983c36f557 Update history to reflect merge of #1394 2013-08-07 23:43:41 +02:00
Parker Moore d05fd32732 Merge pull request #1394 from catsby/drafts_flag
Add -D short-form switch for drafts
2013-08-07 14:38:49 -07:00
Clint Shryock f4c8bcc317 Add -D short-form switch for drafts
Add -D short-form switch for the drafts option, to compliment --drafts
2013-08-07 16:01:21 -05:00
Parker Moore ab0a39fde9 Update history to reflect merge of #1364 2013-08-07 17:13:03 +02:00
Parker Moore 826293ebe3 Merge pull request #1364 from koron/write-in-binary-mode
use binary mode when writing file.
2013-08-07 08:12:27 -07:00
Parker Moore ccedcd0eb9 Use .empty? instead of == '' 2013-08-07 17:12:13 +02:00
Parker Moore 46b0d5037b Add test for Configuration#fix_common_issues 2013-08-06 21:22:08 +02:00
Parker Moore d19c6983f2 paginate option cannot be 0. 2013-08-06 21:04:15 +02:00
Parker Moore 6eec3a7942 Print warning when `paginate` is set to `true`.
Related to #1105.

Sample output:
~/code/jekyll/tsite$ ../bin/jekyll build --trace
Configuration file: /Users/parker/code/jekyll/tsite/_config.yml
    Config Warning: The `paginate` key must be a positive integer or nil. It's currently set to 'true'.
            Source: /Users/parker/code/jekyll/tsite
       Destination: /Users/parker/code/jekyll/tsite/_site
      Generating... done.
2013-08-06 20:56:29 +02:00
Parker Moore 8f7e229e8c Cleaned up the deprecator a little 2013-08-06 20:56:20 +02:00
Parker Moore 1d14692e5d Implement URL conflict checking in `jekyll-doctor`. 2013-08-06 20:41:00 +02:00