Commit Graph

984 Commits

Author SHA1 Message Date
Dmitry Chestnykh 8fe25a6958 Replace directory_watcher with listen.
Directory_watcher consumed ~25% CPU on big Jekyll projects (depending on
the number of watched files), since it polled for changes every second.

Listen is easier on CPU, as it uses directory change notifications
provided by OS (currently OS X and Linux), falling back to polling when
they are not available.
2013-09-30 04:33:04 +02:00
Parker Moore 27347596ad Merge pull request #1449 from shigeya/config-encoding-and-yaml-opts
Adding "encoding" configuration (4th version)
2013-09-23 19:30:44 -07:00
Parker Moore c78c4159c0 Merge pull request #1571 from mojombo/non-destructive-array-concat
Use + instead of Array#concat
2013-09-23 07:16:41 -07:00
Edward Ball 943acc4395 Remove overly specific css from site template 2013-09-23 13:23:54 +01:00
Parker Moore a88a63da2d Don't use destructive Array#concat for Liquid Attribute arrays 2013-09-22 18:26:34 -04:00
Shigeya Suzuki c625ddf6cd Invoke File.read with or without options depends on Ruby version
- Extract option fetch method as a separate method
- Added File.read_with_options method to use
- With performance fix
2013-09-19 12:22:50 +09:00
Shigeya Suzuki 97e052df63 Pass encoding parameter as string, not an object 2013-09-19 12:21:26 +09:00
Shigeya Suzuki 8b892ed735 read_yaml to accept optional parameter to override defaults 2013-09-19 12:21:25 +09:00
MURAOKA Taro 4cb24f4b87 consider a case of "site" is unavailable in Convertible 2013-09-19 12:21:25 +09:00
MURAOKA Taro f4c2383d3c write document for config.encoding 2013-09-19 12:21:25 +09:00
MURAOKA Taro 8a28d80690 add encoding for configuration 2013-09-19 12:21:25 +09:00
Matt Rogers 793eb96a77 Merge pull request #1490 from penibelst/allow-include-read-override
Extract include tag read file in a method
2013-09-18 19:34:45 -07:00
Anatol Broder ec85c49de3 Change exception type 2013-09-17 22:11:56 +02:00
Anatol Broder 7cec996f90 Validate the entire markup as soon as possible 2013-09-17 21:41:11 +02:00
Anatol Broder 25519b38f6 Validate file name as soon as possible 2013-09-17 20:57:01 +02:00
Anatol Broder 8017548bd0 Rename variable 2013-09-17 20:46:01 +02:00
Anatol Broder 7f62e69837 Remove obvious comment 2013-09-17 20:36:33 +02:00
Anatol Broder e5f99e2798 Remove return 2013-09-17 20:35:18 +02:00
Anatol Broder 3e2ab58d56 Fix unruby paradigm 2013-09-17 20:34:04 +02:00
Anatol Broder a42e57f274 Rename constants 2013-09-17 20:14:41 +02:00
Matt Rogers de49342324 Merge pull request #1556 from maul-esel/dest-match
Fix up matching against source and destination when the two locations are similar.
2013-09-16 18:34:22 -07:00
Matt Rogers 454e038fad Require 'pathname' 2013-09-16 20:29:57 -05:00
Anatol Broder 3dadc94ce4 Don’t repeat yourself 2013-09-16 23:16:41 +02:00
maul.esel bec4a07c12 Fix handling of source-dest matching being too aggressive
Fixes #1130.
2013-09-16 14:41:20 +02:00
Anatol Broder 891ea8f604 People can symlink it if they want in unsafe mode 2013-09-16 08:37:07 +02:00
Anatol Broder 081b974114 Resolve conflict 2013-09-16 08:19:56 +02:00
Anatol Broder 79f50b0568 Resolve conflict 2013-09-16 08:15:10 +02:00
Parker Moore 6f053fbc8c Update gemspec & version to v1.2.1 2013-09-14 20:59:06 -04:00
Parker Moore 4b8bb68e56 Cleanup newlines in Commands::Serve 2013-09-12 14:05:16 -04:00
Parker Moore c926596be7 Print better messages for detached server. Mute output on detach. 2013-09-12 14:02:52 -04:00
Ishibashi Hideto 421e58ad59 a patch for the issue: [Liquid doesn't render my partial · Issue #1519 · mojombo/jekyll](https://github.com/mojombo/jekyll/issues/1519) 2013-09-10 23:12:15 +09:00
Matt Rogers d8e0f009d2 Merge pull request #1363 from koron/stop-reverse-lookup
disable reverse lookup
2013-09-06 20:37:31 -07:00
Parker Moore afe1291f0c Update Jekyll::VERSION 2013-09-06 22:23:31 -04:00
Matt Rogers 3212aac4bc Merge pull request #1481 from mojombo/pathawks-patch-1
Expose Jekyll version to templates: `jekyll.version`
2013-09-05 13:24:37 -07:00
maul.esel 09ed340835 Fix include tag to avoid NameError 2013-09-02 14:25:13 +02:00
Parker Moore b7e34175d0 Put version under 'jekyll' namespace. 2013-08-30 18:54:03 -04:00
Parker Moore 20f44be87f Merge branch 'patch-1' of git://github.com/pathawks/jekyll into pathawks-patch-1
* 'patch-1' of git://github.com/pathawks/jekyll:
  Use proper Ruby syntax for constant
  Expose Jekyll version to templates
2013-08-30 18:50:58 -04:00
Matt Rogers a9e2a74ea6 Merge pull request #1341 from maul-esel/minor-refactors
Minor refactors
2013-08-29 20:21:08 -07:00
Parker Moore 0d890e4b70 Merge pull request #944 from x3ro/permalink-special-characters
WIP - Improve permalink generation for URLs with special characters
2013-08-28 15:02:20 -07:00
Parker Moore 8ea336945c Merge pull request #1429 from maul-esel/refactor-cleanup
Refactor `Site#cleanup` into Jekyll::Site::Cleaner class
2013-08-26 14:01:53 -07:00
Matt Rogers 4fa4ad2232 Merge pull request #1443 from ddavison/detachment
Detachment
2013-08-24 20:16:42 -07:00
ddavison b163bf637e final mods 2013-08-24 21:31:05 -04:00
maul.esel 4c015fc5ff move Jekyll::Cleaner to Jekyll::Site::Cleaner 2013-08-23 20:42:27 +02:00
maul.esel dbd368f6ee remove no longer necessary condition 2013-08-23 20:41:13 +02:00
ddavison 9681f3a776 adding default configuration to false 2013-08-21 21:00:18 +00:00
ddavison 4e52869f0f adding detachment functionality 2013-08-21 20:53:01 +00:00
Frederic ROS bca28056ef Fix a misleading typo 2013-08-21 14:53:10 +02:00
maul.esel d28858a9e9 put the Cleaner instance in a `Site#site_cleaner` method 2013-08-19 20:15:54 +02:00
maul.esel 0b3005b3b4 make obsolete_files a method (@mattr-) 2013-08-19 20:01:36 +02: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