48f16974ce
Rubocop fixes
2016-05-24 18:27:37 -05:00
7d3f8ac75d
excerpt drop should give access to document's layout
2016-05-24 17:35:03 -05:00
c0910f2bc5
look up the content methods for drops in a smarter way
2016-05-24 17:34:49 -05:00
b019234007
Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid
2016-05-24 17:30:03 -05:00
80a65d161f
rubocop: fix post URL tag code style
2016-05-24 17:23:25 +03:00
0d11511914
rubocop: fix link tag code style
2016-05-24 17:13:54 +03:00
41a8b10780
rubocop: fix highlight tag code style
2016-05-24 17:03:06 +03:00
a8d27e5788
Rubocop: Low hanging fruit
2016-05-23 22:10:49 -05:00
dbda462c2f
Adding double quotes & freeze back to version after rebase
2016-05-20 21:51:16 -05:00
d743c80357
Rubocop fixes for lib/jekyll/utils/ansi.rb
2016-05-20 21:24:34 -05:00
51c4152919
Release a beta.
2016-05-20 19:19:21 -07:00
8ac5b03006
Cleaning up site template & theme updates.
2016-05-20 19:15:46 -07:00
ee2c41ad6a
Merge pull request #4848 from jekyll/new-theme-command
...
Merge pull request 4848
2016-05-19 22:13:05 -07:00
f3a29677f9
Fix rubocop issues.
2016-05-19 21:34:30 -07:00
f7714add15
Add normalize_whitepace filter
2016-05-19 19:59:22 -07:00
12deccc513
Only spec.summary is needed...
2016-05-19 14:39:55 -07:00
20110571ef
Add a Rakefile to do releases as well as adding an example website.
2016-05-19 14:36:01 -07:00
3885057e9e
Fix rubocop offense.
2016-05-19 13:16:32 -07:00
1d81d2087e
Add info about 3.1.6 to master.
2016-05-19 12:54:04 -07:00
5949b4a5bb
Add release information for v3.1.5
2016-05-18 21:38:53 -07:00
eb14b88175
Port forward the release information for v3.1.4
2016-05-18 17:16:52 -07:00
2caff755c4
Set Style/AlignHash EnforcedHashRocketStyle to 'table'
2016-05-16 16:24:01 -07:00
fb860fc1b7
Merge pull request #4888 from TheLucasMoore/Commands
...
Merge pull request 4888
2016-05-16 16:04:40 -07:00
473d85b580
Add CoC and README for theme; make standard with Rubocop
2016-05-16 11:06:47 -07:00
e3df910533
Add more template files and add a ThemeBuilder which can create the site
2016-05-16 10:53:55 -07:00
3611ae99d9
WIP: Add 'jekyll new-theme' command
2016-05-16 10:53:55 -07:00
b64b6aa526
Refactor if/else for new.rb process method
2016-05-13 15:10:59 -05:00
465e7dd8b0
Added Exceptions and Passing ABC Metric
2016-05-13 13:46:42 -05:00
83f8df49ab
Fixing rubocop offenses in lib/jekyll/cleaner.rb
2016-05-13 12:34:11 -05:00
451881efcf
ABC Condition Size too high
2016-05-12 20:21:19 -05:00
894d1fe21e
Tests Passing. Three RuboCop revisions remain
2016-05-12 19:42:04 -05:00
26d0a8db77
Passing RuboCop for commands
2016-05-12 19:11:58 -05:00
6f89fd5f3f
clean.rb passing rubocop
2016-05-12 16:58:17 -05:00
1ae4f513d8
Add 'ruby' to pre-filled Gemfile for 'jekyll new'
...
Fixes #4839
2016-05-12 12:19:46 -05:00
3751b47c50
Cleanup EntryFilter and make it far more robust.
...
* Allow users to filter directories by ending their path with "/"
* Allow users to filter with a Regexp, some scenariors can really require it.
* Use Pathutil#in_path? for Symlink verification, it real/expand.
This also requires some downstream work in "jekyll-watch" which at this time is
not very robust, it doesn't recognize the difference either, and should probably
start doing so (what I mean is detecting "/" and using the full path.)
2016-05-10 20:01:02 -05:00
44cf61d241
Fix #4856 : Don't rescue LoadError or bundler load errors for Bundler.
...
When it comes to bundler it's smart enough to know what to require, and in casees it's not, it's smart enough to accept :require. In most cases when bundler has a LoadError (or otherwise) it's because there is a problem inside of the Gem itself and when this happens, Jekyll will happily let that error slip when it shouldn't, resulting in a badly placed error that is actually wrong. This corrects that so errors can surface properly.
2016-04-29 06:37:57 -05:00
d74f8d6dd9
Fix spacing on the msg in Configuration#renamed_key
2016-04-28 17:55:15 -07:00
1d788203df
Merge pull request #4710 from fenollp/safe-symlinks
...
Merge pull request 4710
2016-04-21 17:38:00 -07:00
298d56aab2
Merge pull request #4808 from jekyll/fix-collection-defaults-
...
Merge pull request 4808
2016-04-21 17:20:02 -07:00
57ccbe08ea
Ensure symlinks work as expected (and secured).
2016-04-21 16:32:52 -07:00
49a3f543f3
Theme: configure sass at initialize time so we don't forget
2016-04-21 16:11:09 -07:00
3b2d68d333
LayoutReader: read proper item from theme class
2016-04-21 16:10:43 -07:00
2b73696d03
Set @path and @base_dir on the Layout per whether it's in the theme
2016-04-21 16:10:19 -07:00
42cc2445a5
Merge branch 'master' into themes
...
* master: (58 commits)
Update history to reflect merge of #4792 [ci skip]
Update history to reflect merge of #4793 [ci skip]
Update history to reflect merge of #4804 [ci skip]
Update history to reflect merge of #4754 [ci skip]
Update history to reflect merge of #4813 [ci skip]
Added missing single quote on rsync client side command
Add v3.0.4 and v3.1.3 to the history.
Fixed typo
Add jekyll-autoprefixer plugin
Explicitly require Filters rather than implicitly.
Update history to reflect merge of #4786 [ci skip]
Update history to reflect merge of #4789 [ci skip]
updates example domain in config template
Globalize Jekyll's Filters.
Update JRuby to 9.0.5.0; Drop the double digit test.
Update Rack-Jekyll Heroku deployment blog post url
convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files
Update history to reflect merge of #4734 [ci skip]
Update history to reflect merge of #4478 [ci skip]
Fix rubocop warning.
...
2016-04-21 11:43:35 -07:00
341407ef2a
Merge pull request #4792 from jekyll/feature/globalize-filters
...
Merge pull request 4792
2016-04-20 14:06:10 -07:00
46b2ab8e88
Merge pull request #4793 from sl4m/change-example-domain-url
...
Merge pull request 4793
2016-04-20 14:03:36 -07:00
87825e1e14
Document#read: frontmatter.all should get relative_path not URL
2016-04-18 13:55:57 -07:00
27366f2e30
Explicitly require Filters rather than implicitly.
2016-04-15 12:02:25 -05:00
b122148acf
updates example domain in config template
2016-04-15 09:29:39 +01:00
1e74c7a547
Globalize Jekyll's Filters.
...
As it stands Jekyll does not globalize it's filters. So anybody wishing to go
into Jekyll's context to process their own Liquid (say in a plugin) may be taken
aback when they find out that Jekyll's filters are not available.
See: jekyll/jekyll-assets#252 .
2016-04-14 20:36:22 -05:00
f210cafdf2
convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files
2016-04-13 23:22:05 -04:00
e470cae6da
Fix rubocop warning.
2016-04-12 19:11:59 +01:00
1ef7653fed
Fix minor code style recommendations and typos.
2016-04-12 18:59:56 +01:00
66c4ff8800
Add a where_exp filter for filtering by expression
...
This commit introduces a where_exp filter, which can be used as follows:
`{{ array | where_exp: "item", "item == 10" }}`
`{{ array | where_exp: "item", "item.field > 10" }}`
`{{ site.posts | where_exp: "post", "post contains 'field'" }}`
`{{ site.posts | where_exp: "post", "post.array contains 'giraffes'" }}`
This permits a variety of use cases, such as reported in: jekyll#4467,
jekyll#4385, jekyll#2787.
2016-04-12 18:52:58 +01:00
1efb1d7a58
Fix #4689 : Use SSLEnable instead of EnableSSL and make URL HTTPS.
2016-04-12 02:59:48 -05:00
41c3dd4cde
Merge pull request #4741 from jekyll/sortable-doc-drop
...
Merge pull request 4741
2016-04-06 17:14:28 -07:00
a224491d20
Merge pull request #4717 from jekyll/cleanup-launch-browser
...
Merge pull request 4717
2016-03-31 18:40:15 -07:00
6ee728efcb
Merge pull request #4537 from Crunch09/fix-warnings
...
Merge pull request 4537
2016-03-31 18:37:32 -07:00
4b471fe9fb
DocumentDrop: add `#<=>` which sorts by date (falling back to path)
2016-03-31 13:41:59 -07:00
4c65772c44
One final "urlsafe" replaced with "ascii"
2016-03-29 10:01:08 +03:00
764a2c1b39
Change urlsafe to ascii also when actually slugifying
2016-03-29 09:46:42 +03:00
e823ac5180
Rename urlsafe to ascii, and document it (on utils.rb)
2016-03-29 09:07:12 +03:00
06ab708edf
Don't blindly assume the last-system.
...
As it was we assumed that any system that wasn't Windows or OS X must be Linux
but the reality of that can be very unlikely. BSD is popular in some places and
it's not Linux and this would cause an error there. If we do not know the
launcher for a platform we should ship an error and have the user file
a bug if they feel it necessary and skip the launch otherwise.
2016-03-27 21:41:23 -05:00
9347e90a67
Use EntryFilter throughout & update tests
2016-03-26 16:40:19 +01:00
bbd2a2b7f1
Rename EntryFilter#bad_symlink? to EntryFilter#symlink_outside_site_source?
2016-03-26 13:12:08 +01:00
33255e3ac3
IncludeTag: implement multiple load paths
2016-03-25 17:44:29 -07:00
0920d2b48a
LayoutReader#read: read in Theme layouts if they aren't already registered
2016-03-25 17:06:26 -07:00
a30068bf3f
Merge remote-tracking branch 'origin/master' into themes
...
* origin/master: (65 commits)
Update history to reflect merge of #4703 [ci skip]
Update history to reflect merge of #4712 [ci skip]
Highlight the test code
Update history to reflect merge of #4640 [ci skip]
readded "env=prod"-condition
Update history to reflect merge of #3849 [ci skip]
Update history to reflect merge of #4624 [ci skip]
Update history to reflect merge of #4704 [ci skip]
Update history to reflect merge of #4706 [ci skip]
Checks for link file extension in tests
Updating assets documentation
Fix test teardown for cleaner.
Update history to reflect merge of #4542 [ci skip]
Add explanation of site variables in the example _config.yml
Use double quotes in the gemfile
Add test for creation of Gemfile by 'jekyll new'
Add comment about github-pages
Update history to reflect merge of #4533 [ci skip]
Ensure Rouge closes its div/figure properly after highlighting ends.
Add Site#config= which can be used to set the config
...
2016-03-25 16:30:25 -07:00
a1a4b3937a
Add Layout#relative_path so the layout can tell us what its path is for error messages
2016-03-25 16:29:37 -07:00
afa89d68f8
Merge pull request #4703 from jekyll/after_init_hook
...
Merge pull request 4703
2016-03-25 16:27:38 -07:00
d213981a24
Fix warnings
...
This removes the following warnings:
- /lib/jekyll/configuration.rb:151: warning: instance variable @default_config_file not initialized
- /lib/jekyll/converter.rb:12: warning: instance variable @highlighter_prefix not initialized
- /lib/jekyll/converter.rb:24: warning: instance variable @highlighter_suffix not initialized
- /lib/jekyll/converters/markdown.rb:9: warning: instance variable @setup not initialized
- /lib/jekyll/converters/markdown/kramdown_parser.rb:60: warning: instance variable @highlighter not initialized
- /lib/jekyll/frontmatter_defaults.rb:97: warning: shadowing outer local variable - path
- /lib/jekyll/plugin.rb:66: warning: instance variable @safe not initialized
- /lib/jekyll/regenerator.rb:147: warning: instance variable @disabled not initialized
- /test/test_convertible.rb:40: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_filters.rb:154: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_new_command.rb:84: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_site.rb:234: warning: assigned but unused variable - site
- /test/test_site.rb:240: warning: assigned but unused variable - site
- /test/test_site.rb:522: warning: assigned but unused variable - source
- /test/test_tags.rb:153: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:425: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:449: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:496: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:496: warning: instance variable @result not initialized
- /test/test_tags.rb:511: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:773: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:773: warning: instance variable @result not initialized
- /test/test_tags.rb:788: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_url.rb:66: warning: shadowing outer local variable - doc
- /lib/jekyll/url.rb:119:in `escape_path': warning: URI.escape is obsolete
2016-03-25 22:03:17 +01:00
1ab0ed3664
Merge pull request #4640 from surrim/symlink_static_files
...
Merge pull request 4640
2016-03-25 12:19:17 -07:00
bdaa0c3b5b
register sass path
2016-03-25 14:46:00 -04:00
9be387ef6f
readded "env=prod"-condition
2016-03-25 19:42:53 +01:00
f60d3a8dbc
Allow symlinks iff they point to stuff inside site.source
2016-03-25 15:14:04 +01:00
7a4817e55a
Merge pull request #3849 from shinkondo/master
...
Merge pull request 3849
2016-03-24 13:54:03 -07:00
da4a664290
Merge pull request #4624 from jeffkole/feature/add-collection-url-tag
...
Merge pull request 4624
2016-03-24 12:50:05 -07:00
59d1a122c6
Merge pull request #4704 from jekyll/parkr-patch-1
...
Merge pull request 4704
2016-03-24 12:40:49 -07:00
87d0f03f5c
Merge pull request #4542 from jekyll/jekyll-new-with-gemfile
...
Merge pull request 4542
2016-03-23 17:49:46 -07:00
7695ba6eb4
Add explanation of site variables in the example _config.yml
2016-03-23 17:44:11 -07:00
01d48320fd
Merge remote-tracking branch 'upstream/master'
2016-03-23 19:33:22 -05:00
22d9312eaf
Use double quotes in the gemfile
2016-03-23 17:25:19 -07:00
09f9f193d8
Add comment about github-pages
2016-03-23 17:15:35 -07:00
4ce50e3936
Merge pull request #4533 from hgoodman/feature/show-dir-listing
...
Merge pull request 4533
2016-03-23 17:01:16 -07:00
9b60df8883
Add Site#config= which can be used to set the config
2016-03-23 13:14:30 -07:00
84b7d9b3ac
Add Hook for :site :after_init
2016-03-23 13:14:08 -07:00
b06af5a44f
Use encode for xml_escape filter
2016-03-21 11:07:46 -07:00
848b1358a1
Merge pull request #4491 from jekyll/ignore-tilde
...
Merge pull request 4491
2016-03-20 15:34:35 -07:00
c0dec091a2
Add urlsafe to accepted slugify modes
2016-03-18 17:14:54 +02:00
36dc8c2169
Add urlsafe method for slugify
2016-03-18 11:13:06 +02:00
4b32bd2b13
Updates code styling per PR
2016-03-17 14:26:13 -07:00
f79f9d60a9
Changes `collection_url` tag to `link` tag
2016-03-17 14:01:04 -07:00
4883a24363
PostComparer#post_date use the provided date instead of re-parsing the whole name.
2016-03-15 16:08:32 -07:00
97efa0f0ce
Clean up Tags::PostUrl a bit
2016-03-15 16:06:25 -07:00
285aa54445
remove even more asset support
2016-03-11 16:18:11 -05:00
e3c71ea407
Merge branch 'master' into themes
2016-03-11 14:44:44 -05:00
92168954d2
remove asset support
2016-03-11 14:41:26 -05:00
2ea3bc53d3
Merge pull request #4653 from mlinksva/patch-2
...
Merge pull request 4653
2016-03-11 13:35:22 -06:00
4948b5a3b3
change smartify doc from copy/paste of mardownify doc
2016-03-11 11:09:03 -08:00
64d5e3dfd3
removed "env=prod"-condition
2016-03-11 19:26:16 +01:00
79f8210fff
'jekyll clean': also remove .sass-cache
2016-03-11 10:04:36 -08:00
52eb60e171
use copy_entry only in safe mode
2016-03-11 18:45:40 +01:00
9e0ed00a59
Merge pull request #4555 from timwis/patch-1
...
Merge pull request 4555
2016-03-08 16:25:15 -08:00
9520d9bbf9
Merge pull request #4636 from HugoGiraudel/patch-4
2016-03-08 16:04:02 -06:00
eb341514a7
use def_delegator
2016-03-08 11:55:16 -05:00
e8617cf7cd
better theme-not-found handling
2016-03-08 11:53:29 -05:00
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
c86fba6fb3
use /assets for theme assets, not _assets
2016-03-06 15:42:08 -05:00
46bdaa49dc
using FileUtils.copy_entry instead of FileUtils.cp to allow symlinks
2016-03-05 23:31:16 +01:00
8b880cb993
add theme tests
2016-03-05 13:35:52 -05:00
ada7c4f441
revert layout reader
2016-03-05 13:05:57 -05:00
47416169c3
add sass path
2016-03-05 13:05:11 -05:00
8bfb9e51f3
Merge branch 'master' into themes
2016-03-05 13:04:15 -05:00
37cc45239d
Merge pull request #4635 from HugoGiraudel/patch-3
...
Added role="banner" to <header>
2016-03-05 02:22:10 -06:00
664206608d
Removed unnecessary nesting from _base.scss
2016-03-04 17:40:19 +01:00
90e83e0636
Changed main <div> to <main> and added aria-label="Content"
2016-03-04 17:33:44 +01:00
09b9db259c
Added role="banner" to <header>
2016-03-04 17:32:21 +01:00
ff91463c43
Added a default lang attribute
2016-03-04 17:03:26 +01:00
b80a0cb5ce
Adds collection_tag
...
This tag mirrors the post_tag functionality but for collections instead of just
posts.
2016-03-02 14:56:30 -08:00
67904e849d
Ensures related_posts are only set for a post
...
Prior to this change, the related posts for the most recently rendered post
stayed set on the `site` object. This could result in pages that showed related
posts even when the page represented an entire collection of posts, such as on
an index page. This change restores the functionality from Jekyll V2.
2016-03-01 12:05:49 -08:00
14e9ec2bbb
Doctor: correctly set key name so --config works
...
Fixes #4598
2016-02-29 16:17:49 -08:00
c16a2f4d6a
Merge pull request #4590 from tonyg/pr4582
...
Merge pull request 4590
2016-02-29 16:12:06 -08:00
cddea273a9
Merge pull request #4557 from timwis/patch-2
...
Merge pull request 4557
2016-02-29 16:08:11 -08:00
9b889217fa
Merge pull request #4611 from jekyll/draft-time-source-mtime
...
Merge pull request 4611
2016-02-29 16:00:52 -08:00
ac704b9763
Merge pull request #4545 from jekyll/allow-no-extensions-coll-docs
...
Merge pull request 4545
2016-02-29 15:50:29 -08:00
ae228705b2
Document#date: drafts which have no date should use source file mtime
2016-02-29 15:46:11 -08:00
dafb25cbfe
Escape title and description
...
Follows after #4307 .
2016-02-28 22:07:10 +09:00
91b348966e
add theme class
2016-02-26 14:25:29 -05:00
fa1eb68941
Fix for issue #4582 , plus simple test
2016-02-26 11:06:03 -05:00
6245ddb14d
where filter uses array for everything
2016-02-25 10:18:03 -05:00
7542ab51b7
Add size property to group_by result
2016-02-20 20:30:38 -05:00
64ad293b89
add array support to where filter
2016-02-20 19:46:48 -05:00
05d753f4e0
Release 💎 v3.1.2
2016-02-19 15:40:57 -08:00
d929242e2b
Permalinks which end in a slash should always output HTML
...
Duplicates #4493 for 3.1.1.
/cc @jekyll/core
2016-02-19 15:02:13 -08:00
3aa80b7d04
Allow collections to have documents that have no file extension
2016-02-19 13:40:17 -08:00
551f8b751f
`jekyll new` should create a Gemfile which is educational
2016-02-18 16:56:39 -08:00
d387fd0baa
Add show_dir_listing option for serve command
2016-02-17 20:54:57 -08:00
db9865ebb6
Merge pull request #4525 from atomicules/capitalize-in-titleize
...
Merge pull request 4525
2016-02-15 20:50:42 -08:00
e4aa45b03f
Fix titleize_slug so already capitalized words are not dropped
...
Previously `titleize` used `capitalize!` which has the side effect of
returning `nil` for anything already starting with a capital letter. This
commit changes it to just `capitalize`.
Example, before:
A file "2016-01-01-This-is-a-title-with-Capitals.markdown" would return "Is A
Title With" for `post.title`
Example, after:
A file "2016-01-01-This-is-a-title-with-Capitals.markdown" will return "This Is A
Title With Capitals" for `post.title`
Tests added for `titleize_slug` in test_utils.rb
Fix problem introduced in 67f842546e#4525
2016-02-15 21:22:50 +00:00
e191109549
add consistency to the deprecation message
2016-02-09 23:46:45 -08:00
a040af37c0
Jekyll.sanitized_path: sanitizing a questionable path should handle tildes
2016-02-07 17:53:26 -08:00
0e89a37eaf
Revert "Jekyll.sanitized_path: sanitizing a questionable path should handle tildes"
...
This reverts commit 246e65914f
2016-02-07 17:53:09 -08:00
246e65914f
Jekyll.sanitized_path: sanitizing a questionable path should handle tildes
2016-02-07 17:52:15 -08:00
3373eb6525
EntryFilter#special?: ignore filenames which begin with '~'
2016-02-07 17:28:03 -08:00
5058382d5a
LiquidRenderer#parse: parse with line numbers.
2016-02-02 14:43:45 -08:00
65a1fc4120
Mispell Rouge intentionally.
2016-02-02 12:27:17 -06:00
4d805e29bc
Fix #4427 : Make our @config hash symbol accessible.
2016-01-30 09:48:37 -06:00
bfee5c5b59
Release 💎 v3.1.1
2016-01-28 20:36:51 -08:00
00d753612c
Merge pull request #4404 from jekyll/bom-it
...
Merge pull request 4404
2016-01-28 17:20:33 -08:00
9daebe8dd2
Use improved Page#dir
2016-01-27 08:32:36 -08:00
aad54c9a87
Add Utils.merged_file_read_opts to unify reading & strip the BOM
2016-01-26 17:08:54 -08:00
38b64faeb2
Page#dir: ensure it ends in a slash
2016-01-26 16:44:30 -08:00
d7ff4234f0
Renderer#output_ext: honor folders when looking for ext
...
Previously, even if the document permalink was a folder, it would look for
an extension on that. For example, if I have:
permalink: "/new-version-jekyll-v3.0.0/"
the output_ext would be ".0". Now, the output_ext honors the trailing
slash and will report based on the converters instead.
2016-01-25 15:32:44 -08:00
368f5b67a9
Release 💎 3.1.0
2016-01-24 13:13:15 -08:00
4b827e1797
Release 💎 3.1.0.pre.rc3
2016-01-22 13:15:41 -08:00
ccb382679a
Merge pull request #4195 from jekyll/pull/cleanup-document__post_read
...
Merge pull request 4195
2016-01-22 13:13:18 -08:00
512c7fdb05
Merge pull request #4388 from jekyll/fix-page.class-access
...
Merge pull request 4388
2016-01-22 13:01:04 -08:00
2b8de59717
remove merge conflict
2016-01-22 09:38:34 -08:00
afff4f0bec
Merge remote-tracking branch 'origin/pull/cleanup-document__post_read' into pull/cleanup-document__post_read
...
* origin/pull/cleanup-document__post_read:
add Utils.strip_heredoc
Fix #4191 : Reduce Document#post_read complexity slightly.
Fix #4188 : Extract title from filename successfully when dateless.
2016-01-22 09:37:58 -08:00
5878acaaf1
Document#post_read: only overwrite slug & ext if they aren't set by YAML
2016-01-22 09:36:55 -08:00
8204e479c3
add Utils.strip_heredoc
2016-01-22 09:11:56 -08:00
67f842546e
Fix #4191 : Reduce Document#post_read complexity slightly.
2016-01-22 09:11:56 -08:00
1298ba6908
Fix #4188 : Extract title from filename successfully when dateless.
2016-01-22 09:09:30 -08:00
cf51e32d0e
Drop#[]: use self.class.invokable? instead of content_methods.include? for speed
2016-01-22 08:59:48 -08:00
4ecdf6ce10
Remove extra OR condition since a missing hash key will return a nil anyway. Added a test to catch this nil condition since it was missing to begin with. Reduced line length in test_page.rb
2016-01-21 23:44:30 -06:00
31ae61b419
Drop#[]: only use public_send for keys in the content_methods array
2016-01-21 18:20:35 -08:00
a72629908a
Document: throw a useful error when an invalid date is given
2016-01-20 14:19:06 -08:00
1ba23c32c6
add Utils.strip_heredoc
2016-01-20 11:46:18 -08:00
090cf5a50b
Disable auto-regeneration when running server detached
2016-01-19 23:12:59 -08:00
f8e8672148
Fix #4191 : Reduce Document#post_read complexity slightly.
2016-01-19 11:18:19 -08:00
d50656021f
Fix #4188 : Extract title from filename successfully when dateless.
2016-01-19 11:18:19 -08:00
32fba4f01a
Release 💎 v3.1.0.pre.rc2
2016-01-18 15:39:53 -08:00
e75d703806
Page#write? shouldn't freeze 'true'
2016-01-18 15:33:58 -08:00
4de1873b56
Renderer: #output_ext should check to make sure the output extension of the permalink isn't empty
2016-01-18 14:09:14 -08:00
2554281188
document#merge_data!: reformat
2016-01-18 13:41:49 -08:00
e5d8bdee8f
Page: freeze true in write?
2016-01-18 12:47:48 -08:00
66dc083ad0
Renderer: set paginator
2016-01-18 12:47:36 -08:00
0a6f289ba5
page: write? should always be true
2016-01-18 11:53:16 -08:00
7d81c00b29
Renderer: use Convertible's way of picking the last Converter's output extension
2016-01-18 11:41:47 -08:00
d343da61eb
Page: pipe through Renderer instead of using Convertible
2016-01-18 11:41:05 -08:00
c678640553
Release 💎 v3.1.0.pre.rc1
2016-01-15 16:25:58 -08:00
0daafd7bda
Merge pull request #4361 from jekyll/pheuko-empty-permalink
...
Merge pull request 4361
2016-01-15 16:19:22 -08:00
06fa14c11a
Restructure data validation so that permalink check raises an error.
2016-01-15 16:11:08 -08:00
89db3c6384
Convertible: separate data validation out of #read
2016-01-15 15:52:54 -08:00
948dcf2714
Convertible: consolidate empty check into Convertible#read
2016-01-15 15:51:32 -08:00
15a2dacd37
Merge pull request #4359 from jekyll/optimize-drop
...
Fix deep_merge_hashes! handling of drops and hashes
2016-01-15 15:19:18 -08:00
0587a3bb57
Fix some debug logging.
...
- excluded? should now only print when it is excluded
- requiring is now properly aligned
2016-01-15 11:30:02 -08:00
5d79c55b2c
Fix deep_merge_hashes! handling of drops and hashes
2016-01-15 11:22:39 -08:00
22931f42b8
Drop: require 'json' for #inspect call
2016-01-15 10:00:56 -08:00
3e81331af1
Utils: don't require mime/types
2016-01-15 10:00:45 -08:00
5681742223
Check if permalink key was given
2016-01-15 14:40:59 -02:00
f8a63157d7
Empty permalink now shows an error
2016-01-15 14:40:47 -02:00
70f741b86f
Remove ObectSpace dumping and start using inherited, it's faster.
2016-01-10 14:08:53 -06:00
735554007c
Merge pull request #4314 from jekyll/allow-custom-php-extensions
...
Merge pull request 4314
2016-01-09 18:11:47 -08:00
bb4f5910c9
document: don't cache @output_ext
...
Fixes race issue.
Will introduce perf issues, though...
2016-01-09 18:04:13 -08:00
ddf640e6bd
Test all the things
2016-01-08 17:10:36 -08:00
acb2263f51
Add smartify filter
2016-01-07 02:36:24 -08:00
a1b39840bb
Revert change to Collection#url_template which caused test breakage.
...
Reverts dab53a697b
2016-01-06 10:13:13 -08:00
b1a2115948
Fix spelling of GitHub in docs and history
...
* Github -> GitHub
* GitHub pages -> GitHub Pages
2016-01-06 17:21:09 +01:00
dc31264160
url: tiny optimization to #generate_url_from_drop
2016-01-04 18:18:28 -08:00
9579924f8a
drop: tiny optimization to .mutable to create fewer objects
2016-01-04 18:18:12 -08:00
dab53a697b
collection: tiny optimization to #url_template
2016-01-04 18:17:51 -08:00
b6c283a4ae
wip: allow custom extensions
2016-01-04 17:42:06 -08:00
f995d86673
Merge pull request #4254 from jekyll/shim-docs-import-with-nudge
...
Merge pull request 4254
2016-01-04 16:30:30 -08:00
f47612ee98
Merge pull request #4307 from fulldecent/patch-1
...
Merge pull request 4307
2016-01-04 16:25:41 -08:00
4fe9eecf05
For blessed gems, shim their commands so users know how to use them.
2016-01-04 16:10:21 -08:00
cb5bc1093e
utils: has_yaml_header? should accept files with extraneous spaces
...
Occasionally, extra spaces at the end of the YAML front matter prologue are
saved to a file and it goes missing without telling the user why. This
should simply accept those changes without any detriment to the user,
allowing anyone to add as many spaces as they like to the end of their
front matter prologues.
2016-01-04 14:09:30 -08:00
e097a15657
Merge pull request #4312 from jekyll/fix-layout-metadata
...
Merge pull request 4312
2016-01-04 13:05:00 -08:00
95a3c54ddb
drop: only check mutable if the key is a method
2016-01-04 12:41:40 -08:00
06c45df8c3
Drop: hash syntax should use setter method for a property if it's defined
2016-01-04 12:38:41 -08:00
735194ccaf
Convertible/Page/Renderer: use payload hash accessor & setter syntax
2016-01-04 12:37:19 -08:00
060904d809
Rubocop: Style/TrailingWhitespace
...
- Trailing whitespace detected
Rubocop: Style/EmptyLines
- Extra blank line detected
Rubocop: Style/EmptyLinesAroundBlockBody
- Extra empty line detected at block body beginning
2016-01-04 12:16:36 -08:00
ab3d906e04
Rubocop: Style/ParenthesesAroundCondition
...
- Don't use parentheses around the condition of an if
2016-01-04 12:14:00 -08:00
cce848d3d8
Rubocop: Avoid single-line method definitions
2016-01-04 12:12:17 -08:00
c1c8b6dbf7
Rubocop: Style/SpaceInsideHashLiteralBraces
2016-01-04 12:07:34 -08:00
04e635b10c
Rubocop: Style/SpaceInsideRangeLiteral
...
- Space inside range literal
2016-01-04 12:06:40 -08:00
6711234d5f
Rubocop: Style/BlockDelimiters
...
- Avoid using {...} for multi-line blocks
2016-01-04 12:05:54 -08:00
086e85ca9e
Rubocop: Style/PerlBackrefs
...
- Avoid the use of Perl-style backrefs
2016-01-04 12:01:23 -08:00
be3666fcf0
Rubocop: Do not use unless with else
...
- Rewrite these with the positive case first
2016-01-04 11:51:14 -08:00
ec83ef60b5
Rubocop: Lint/UselessAssignment
2016-01-04 11:49:54 -08:00
085a778b0a
Rubocop: Style/NestedTernaryOperator
...
- Ternary operators must not be nested. Prefer if/else constructs instead.
2016-01-04 11:46:25 -08:00
78e9f3389e
Rubocop: Style/IndentationWidth
2016-01-04 11:42:17 -08:00
f9926edbc4
Rubocop: Style/TrivialAccessors
...
- Use `attr_writer` to define trivial writer methods
2016-01-04 11:39:14 -08:00
af9ec6831d
Rubocop: Style/ElseAlignment
...
- Align else with if
Rubocop: Lint/EndAlignment
- Align end with if
2016-01-04 11:23:06 -08:00
f6fd9014ba
Rubocop: Style/CaseIndentation
...
- Indent when as deep as case
2016-01-04 11:15:37 -08:00
2c9a349f9a
Rubocop: Style/Next
...
- Use next to skip iteration
2016-01-04 11:10:52 -08:00
f221b925b4
Rubocop: Lint/StringConversionInInterpolation
...
- Redundant use of Object#to_s in interpolation
2016-01-04 11:08:31 -08:00
13c980c896
Rubocop: Style/TrailingComma
2016-01-04 11:08:31 -08:00
4c5d77a4b5
Rubocop: Style/EmptyLines
2016-01-04 11:08:18 -08:00
fd8fdd87d3
Rubocop: Style/RegexpLiteral
2016-01-03 17:10:39 -08:00
e3189e3828
Rubocop: Lint/UnusedMethodArgument
2016-01-03 17:07:39 -08:00
11f0aab4b1
Rubocop: Lint/UnusedBlockArgument
...
- Unused block argument
2016-01-03 16:24:13 -08:00
7ca4f7cd62
Rubocop: Style/Proc
...
- Use proc instead of Proc.new
...and use lambda instead of proc
2016-01-03 16:18:26 -08:00
af5d51289f
Rubocop: Style/SymbolProc
...
- Pass &:to_sym as an argument to map instead of a block
- Pass &:capitalize as an argument to select instead of a block
- Pass &:to_s as an argument to map instead of a block
2016-01-03 16:02:32 -08:00
704ca6b8cc
Rubocop: Style/NegatedIf
...
- Favor unless over if for negative conditions
2016-01-03 15:59:12 -08:00
663a2d3279
Rubocop: Style/SpaceBeforeBlockBraces
...
Rubocop: Style/SpaceInsideBlockBraces
2016-01-03 15:58:02 -08:00
a70d89a862
Rubocop: Style/SpaceAfterComma
...
- Space missing after comma
2016-01-03 15:56:44 -08:00
cda226de45
Rubocop: Style/EmptyLinesAroundClassBody
...
- Extra empty line detected at class body end
2016-01-03 15:55:33 -08:00
2530a8cdfc
Rubocop: Style/HashSyntax
...
- Use hash rockets syntax
2016-01-03 15:49:22 -08:00
d157a04c6d
Rubocop: Performance/StringReplacement
...
- Use delete! instead of gsub!
- Use tr instead of gsub
2016-01-03 15:47:31 -08:00
ff5f7b7120
Rubocop: Style/DeprecatedHashMethods
...
- Hash#has_key? is deprecated in favor of Hash#key?
Add method `key?` to Drop
2016-01-03 15:41:04 -08:00
98a19cdf2b
Rubocop: Style/PercentLiteralDelimiters
...
- %w-literals should be delimited by ( and )
Rubocop: Style/WordArray
- Use %w or %W for array of words
2016-01-03 15:32:11 -08:00
fb0457bf3d
Rubocop: Style/AndOr
...
- Use && instead of and
- Use || instead of or
2016-01-03 15:30:26 -08:00
6550867051
Rubocop: Style/SpecialGlobalVars
...
- Prefer $LOAD_PATH over $:
2016-01-03 15:29:49 -08:00
8223ebd861
Use select and find instead of conditional loop
2016-01-03 15:24:18 -08:00
0eae36aec2
Rubocop: Style/LineEndConcatenation
...
- Use \ instead of + or << to concatenate those strings
2016-01-03 14:41:49 -08:00
44d2995277
Rubocop: Style/Semicolon
...
- Do not use semicolons to terminate expressions
2016-01-03 14:40:45 -08:00
31dd0ebed5
Rubocop: Style/EmptyLiteral
...
- Use array literal [] instead of Array.new
- Use hash literal {} instead of Hash.new
2016-01-03 14:39:01 -08:00
22a0be3f7b
Escape html from site.title and page.title
2016-01-03 16:10:38 -05:00
f2f88dbd9f
Move require "jekyll/drops/drop" to "jekyll.rb"
...
Linux does not read files in alphanumeric order, this can lead to
Jekyll drops not working on Linux because the assumption here is that
the collection drop will be required first.
2015-12-27 12:48:21 -06:00
5034216637
Release 💎 3.1.0.pre.beta1
2015-12-27 08:32:08 -05:00
7c4876d2eb
Merge pull request #4289 from jekyll/fix-utils-deep-merge-drops
...
Merge pull request 4289
2015-12-27 08:27:25 -05:00
1b73751abf
Merge branch 'fixup-custom-markdown'
...
* fixup-custom-markdown:
markdown: minor style fixes
Add support for underscores.
Refactor: lib/jekyll/convertor/markdown.rb - tests: no additions/breaks.
2015-12-27 08:24:16 -05:00
8e887dcd8b
markdown: minor style fixes
...
ref: #3771
2015-12-27 08:24:00 -05:00
5bf596b239
utils/drops: update Drop to support Utils.deep_merge_hashes
...
Fixes #4287
2015-12-27 08:06:37 -05:00
d138558c1d
drops: provide #to_h to allow for hash introspection
...
Follow-up to #4277
2015-12-26 14:25:29 -05:00
3fa8af2a18
drops: create one base Drop class which can be set as mutable or not
2015-12-26 13:43:42 -05:00
57613b31dd
Slightly restructure rake helper files
...
Ref #4282
2015-12-26 12:53:30 -05:00
e3da5a3f9f
Merge pull request #4282 from leethomas/refactor-rake-tasks
...
Merge pull request 4282
2015-12-26 12:47:30 -05:00
1f298e0d9d
url: move setter outside of if statement
...
Addresses @envygeeks's comment:
d070a77716 (commitcomment-15164169)
2015-12-26 12:32:21 -05:00
b70ea3ca5c
immutable_drop/errors: consolidate errors & fix syntax for raising
...
Addresses @envygeeks's comments:
bff1726a5a
2015-12-26 12:27:07 -05:00
1afbe9967d
document: return nil if bad arg in #<=>
...
Addresses @envygeek's comment:
233589e150 (commitcomment-15164178)
2015-12-26 12:23:21 -05:00
b05b174b87
moved namespaced rake tasks to separate .rake files under lib/tasks
2015-12-25 22:50:23 -08:00
c63b51b661
document: revert comparison of Documents to old style & add nil check
...
@envygeeks, this should address your comment: fcce0d5482 (commitcomment-15162261)
2015-12-25 22:54:12 -05:00
debdb15171
Move 'forwardable' require to earlier in the program start up.
2015-12-25 22:45:51 -05:00
b2b634e767
drops: use def_delegator more liberally where acceptable
2015-12-24 15:07:48 -05:00
fcce0d5482
document: fix issue with bad comparison
2015-12-24 15:07:31 -05:00
d070a77716
url: fix issue with bad URL escaping when using Drop
2015-12-24 15:07:20 -05:00
bff1726a5a
immutable_drop: use custom error for bad set
2015-12-24 15:06:32 -05:00
233589e150
document: throw ArgumentError if compared to non-doc
2015-12-22 21:34:24 -05:00
532bb9e9cb
Further consolidation in the Drops.
2015-12-22 21:33:42 -05:00
4935e85f7c
CollectionDrop: to_s should work like Array#to_s
2015-12-21 23:41:36 -05:00
03488b1cde
DocumentDrop: use def_delegators instead of duplicating methods
2015-12-21 23:36:31 -05:00
ebe3c10604
Drops: fix accessing of site collections via site.COL_NAME
2015-12-21 23:33:33 -05:00
82c3ee365f
Initial work on using Liquid::Drops instead of Hashes.
...
The properties of Liquid::Drops are only evaluated when they're asked for
and therefore save computation time. This prevents a lot of GC time cleaning
up objects that are not needed, because they're not created unless requested.
Additionally, this saves time for actual computation of those values because
they can be computed only if needed.
It's funny how much it helps when you only do what is needed. Far less overhead.
2015-12-21 22:47:30 -05:00
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
92adfd0e46
Merge pull request #4052 from Crunch09/process-empty-config-files
...
Merge pull request 4052
2015-12-11 14:11:11 -08:00
b94800361b
Collection: change missing_method message to be a bit clearer.
...
Fixes #4234 . Fixes #4199 .
2015-12-11 14:07:34 -08:00
4f21458b34
Merge pull request #4184 from ducktyper/allow-quoted-dates
...
Merge pull request 4184
2015-12-11 14:02:55 -08:00
11959ab2bc
Merge pull request #4233 from RochesterinNYC/patch-1
...
Merge pull request 4233
2015-12-07 22:10:09 -08:00
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
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
b63712e403
Fix an edge where file is sometimes not returned properly.
2015-12-05 04:48:51 -06:00
99042fa870
Improve error message
2015-12-05 16:21:50 +13:00
c6255d5f28
Merge pull request #4223 from jekyll/pull/sample-filter
...
Merge pull request 4223
2015-12-04 14:12:18 -08:00
47d2a2459d
filters: refactor #sample to leave off the arg
2015-12-04 13:48:09 -08:00
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
2e91d094e5
filters#sample: n == 1, return item; n > 1, return array
2015-12-04 10:25:13 -08:00
28c568386d
Merge pull request #4220 from jekyll/pull/enable-codeclimate-platform
...
Fix : #4219 : Add CodeClimate Platform.
2015-12-04 12:08:00 -06:00
b6de905ee4
Fix : #4219 : Add CodeClimate Platform.
2015-12-04 11:42:52 -06:00
86195655d7
filters: allow sample(n) instead of just sample(1)
2015-12-04 09:40:57 -08:00
96bc62c666
Add 'sample' Liquid filter
...
Equivalent to Array#sample functionality
2015-12-04 09:33:33 -08:00
6cbd06ea85
Merge pull request #4109 from jekyll/cleanup-kramdown-converter
...
Merge pull request 4109
2015-12-04 09:21:22 -08:00
fe13c3b366
KramdownConverter: clean up some source with some unified methods
2015-12-04 09:21:11 -08:00
e331a37260
Fix #4202 : Have Kramdown behave like Github.
2015-12-04 11:11:30 -06:00
3432fd2c2d
Modernize Kramdown for Markdown converter.
2015-12-04 08:09:08 -06:00
b90f8e048a
Merge pull request #4150 from ducktyper/master
...
Merge pull request 4150
2015-11-30 19:57:01 -08:00
4890cecaf3
Merge pull request #4205 from jekyll/pull/fix-layout-vs-page-data
...
Merge pull request 4205
2015-11-30 19:55:36 -08:00
ac9fa413a5
Convertible should make layout data accessible via 'layout'
...
Not via 'page'. Erroneous!
Fixes #4117 .
2015-11-30 14:35:55 -08:00
c8edb15820
Prevent shell injection when opening a URL.
2015-11-29 21:22:27 -06:00
64e87bfac9
Merge pull request #4144 from friedenberg/master
...
Merge pull request 4144
2015-11-28 23:21:30 -08:00
face3985dc
add "-o" option to serve command which opens server URL
2015-11-28 15:13:44 -05:00
c159f19c7d
Rename destructive method with bang
2015-11-26 00:06:09 +13:00
e60e5f3532
Allow quoted date in front matter defaults
2015-11-25 23:18:33 +13:00
657a8d7239
Allow users to input multiple variables in include tag
2015-11-25 16:37:08 +08:00
ac1b2b88d4
Merge pull request #4160 from jekyll/fix-html-htm-xhtml-pages
...
Merge pull request 4160
2015-11-24 16:19:46 -08:00
35070d6806
added debug message to collection
2015-11-24 16:02:10 -07:00
f7a2b52cd9
Merge pull request #4174 from gfxmonk/master
...
Fix #4173 : Rename @options so that it does not impact Liquid.
2015-11-24 04:19:57 -06:00
a7730914df
rename `@options` in HighlightBlock (clash with Liquid::Block). fixes #4173
2015-11-24 20:24:44 +11:00
16aea22c8d
pass build options into clean command
2015-11-23 22:38:45 +08:00
275aea11d1
Merge pull request #4168 from jekyll/pr/cleanup-url-sanitize
...
Slightly speed up url sanitization and handle multiples of ///.
2015-11-19 19:26:31 -06:00
487d9ffc21
Slightly speed up url sanitization and handle multiples of ///.
2015-11-19 18:46:03 -06:00
e9f8b4df74
Add Windows support to Utils.safe_glob
2015-11-19 17:15:51 +13:00
90865d5fc1
Fix #4082 : Allow users to use .htm and .xhtml (XHTML5.)
2015-11-18 16:02:03 -06:00
c1761bc478
Merge pull request #4120 from rebornix/CacheIncludeTemplate
...
Merge pull request 4120
2015-11-18 11:53:10 -08:00
20735e12f9
Use safe_glob to unsafe glob
2015-11-19 01:02:48 +13:00
a168edae45
Add Utils.safe_glob method
...
which works the same way as Dir.glob but seperating the input
into two parts ('dir' + '/' + 'pattern') to make sure
the first part('dir') does not act as a pattern.
2015-11-19 00:46:46 +13:00
2b4a3c008d
Release 💎 3.0.1
2015-11-17 22:19:45 -08:00
6a98ab2a15
Make `:title` cased for backwards compability and add `:slug` for uncased usage.
2015-11-18 10:43:13 +08:00
bd2c337e5b
Avoid using Dir.glob with absolute path
...
the absolute path including '[', '{', '?', or '*'
could change the outcome
2015-11-18 02:18:25 +13:00
246ff3f9b6
Remove Post autoload
...
Seems like this got missed. Referencing `Jekyll::Post` results in a `LoadError`
2015-11-11 11:55:54 -05:00
87a8695196
Cache include file to save liquid parsing time.
2015-11-10 21:08:37 +08:00
d1cbea8a37
Fix the deprecation warning in the doctor command
2015-11-06 09:48:42 -05:00
db6103bdee
Document: only superdirectories of the collection are categories
2015-11-04 15:18:02 +07:00
bbc2b66a84
Merge pull request #4104 from willnorris/fix-hooks
...
Merge pull request 4104
2015-11-04 07:13:16 +07:00
1bfe5a6f95
align hooks documentation and implementation
...
- add site post_render hook, which was documented but wasn't being
called
- define documents post_init hook, which was documented but caused an
error when called (fixes #4102 )
- add docs for site post_read hook, which was being called but wasn't
documented
- fix container name in example: s/post/posts/
2015-11-03 07:47:32 -08:00
e5279d4773
Santize @config['highlighter'] to only allow highlighters supported by kramdown
2015-11-01 23:04:59 +00:00
9d1641f163
Fix #3371 - kramdown:syntax_highlighter should automatically take value of highlighter
2015-10-31 23:58:49 +00:00
48b23858ad
Merge pull request #4079 from jekyll/fix-jekyll-metdata-being-generated-on-non-incremental
...
Merge pull request 4079
2015-10-31 03:40:32 +08:00
0f4aed9ccf
Fix #4066 : Move Convertible#render_liquid to using render!
2015-10-29 16:06:17 -05:00
71f4383d18
Fix #4075 : Make sure that .jekyll-metadata is not generated when not needed.
2015-10-29 15:44:38 -05:00
e5f26b5a36
Fix test warnings when doing rake {test,spec} or script/test
2015-10-29 15:18:19 -05:00
cf71c563ab
Handle empty config files
...
SafeYAML.load_file returns `false` when processing empty files so we
convert this into an empty hash for further processing.
fixes #4030
2015-10-28 22:31:42 +01:00
5082e144d8
Release 💎 3.0.0.pre.rc1
2015-10-26 20:22:53 -07:00
7b81f00137
Defaults: compare paths in applies_path? as Strings to avoid confusion
...
/cc #4064
2015-10-26 17:28:20 -07:00
45f69bb8cd
Utils: deep_merge_hashes should also merge default_proc
...
If the target hash's default_proc isn't set, overwrite with the new hash's default_proc.
/cc #4064
2015-10-26 17:27:36 -07:00
e45b6f91e7
Document: Only auto-generate the excerpt if it's not overridden
...
Fixes #4061
2015-10-26 16:08:19 -07:00
79c33af3fc
post_url: fix access deprecation warning & fix deprecation msg
2015-10-26 14:46:42 -07:00
05ba1afc29
Release 💎 v3.0.0.pre.rc1
2015-10-26 14:42:03 -07:00
d6176d6010
Merge pull request #4059 from alfredxing/disable-incremental-default
...
Merge pull request 4059
2015-10-26 14:41:03 -07:00
2a040fd527
Rename incremental regeneration flag
...
Rename from `full_rebuild` to disable, to `incremental` to enable
2015-10-26 14:20:44 -07:00
d9b12bc090
Disable incremental regeneration by default in Jekyll 3.0
...
Disable the feature as it's still not 100% working 100% of the time. Feature
can be re-enabled by specifying `full_rebuild: false` in the configuration
2015-10-26 13:37:47 -07:00
2e7c471c70
Add Document#method_missing and Collection#method_missing
...
Proxies calls to either #data or #docs, respectively. Deprecation warning is printed.
2015-10-26 13:37:04 -07:00
e9e4a5d21e
Merge pull request #4053 from sparanoid/patch-1
...
Merge pull request 4053
2015-10-26 09:56:03 -07:00
e58d0ae0ef
Merge pull request #4055 from jekyll/beefer-collections
...
Merge pull request 4055
2015-10-26 09:53:13 -07:00
b89f943bf2
collections: posts as collection
2015-10-26 00:29:14 -07:00
2f5303dd67
Apply rouge highlighter background to child node
2015-10-26 15:17:04 +08:00
58365ae898
Add missing highlighting CSS class for Rouge
2015-10-25 19:40:40 +08:00
c84627b2e1
Change default font weight to 400 to fix bold/strong text issues
2015-10-22 00:30:14 -07:00
d8f38eef0e
Made icon-twitter.html inline-able
2015-10-20 09:03:27 -04:00
2cde74c44b
Use GitHub icon inline in about.md
...
Had to remove whitespace from icon includes
because Markdown...
2015-10-20 08:56:36 -04:00
5d92a90bde
Make HTML includes for GitHub & Twitter icons
...
Made one for each to avoid over paramaterizing
the includes. Also allows for various icon formats.
2015-10-20 08:52:20 -04:00
c2c671641d
Move GitHub & Twitter icons into includes
2015-10-20 08:46:51 -04:00
271dc42724
Merge pull request #4032 from jekyll/refactor-cleaner-for-expressiveness
...
Make a constant for the regex to find hidden files
2015-10-17 06:56:55 -05:00
ff55da727e
Release 💎 3.0.0.pre.beta10
2015-10-16 12:53:18 -07:00
20303de60d
Merge pull request #4004 from kevinoid/excerpt-match-post-content
2015-10-15 21:13:32 -05:00
b72556fd03
Make a constant for the regex to find hidden files
...
A raw regular expression isn't very expressive, IMHO. Rather than having
people who read this code parse the regular expression to figure out
what it's for, let's give a name. This way, it becomes more obvious what
exactly it is we're doing here.
2015-10-15 20:34:44 -05:00
45902b2047
Avoid "mismatched indentations" warning for ruby -w
2015-10-11 19:49:40 +02:00
bb9462f12f
Whole-post excerpts should match the post content
...
When a post does not contain an excerpt_separator, meaning the excerpt
includes the entire post, the excerpt should contain exactly the post
content.
This is desirable both from a correctness standpoint, that the excerpt
should not introduce any new content, and more practically to allow fast
and easy detection of whole-post excerpts in Liquid templates using
`post.excerpt == post.content`. A common use-case is deciding whether
to render "Read More" links on a page containing post excerpts.
This commit does exactly that. It avoids adding additional newlines to
the excerpt content when the excerpt includes the whole post and adds
tests to ensure that this behavior is correct and preserved going
forward.
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
2015-10-01 13:58:00 -07:00
951c604017
Add timezone as hour & minute offset in the initial post in the new site template. Fixes #3998
2015-09-28 22:18:02 +02:00
1703b59ce8
Add header message to _config.yml
...
The first thing new users to Jekyll do is open _config.yml, so this
change adds a simple welcome message to the top of it. Additionally,
it informs the user that the file is not automatically reloaded when
changed, which is a point of confusion for new users.
Related issue: https://github.com/jekyll/jekyll/issues/2302
2015-09-25 18:57:46 -07:00
e193f5a738
Merge pull request #3992 from jekyll/abort-before-confusing-msg
...
Merge pull request 3992
2015-09-24 16:06:26 -07:00
22b59ae793
Added permalink time variables
2015-09-23 21:51:02 -03:00
c7bc76269c
Abort if no subcommand.
...
Fixes #3412
2015-09-23 17:32:33 -07:00
f3b99ebda7
Release 💎 3.0.0.pre.beta9
2015-09-21 12:31:00 -07:00
908bb2e7af
Fix #3970 : Use Gem::Version to compare versions, not >.
2015-09-11 14:44:20 -05:00
93d282a5c1
Merge pull request #3828 from superlukas/fix-clean-command
...
Merge pull request 3828
2015-09-02 20:22:14 -07:00
4169075dd1
filters: `where` should compare stringified versions of input & comparator
...
Non-string input was being missed as a result of poor comparison.
Converting inputs to strings ensure numerical and boolean values are
properly compared.
Fixes #3911 .
2015-08-25 23:00:58 -07:00
1eb1f4ea4d
add script to vendor mime types
2015-08-24 16:21:50 -04:00
8927898e1f
Merge pull request #3871 from stevecrozz/3870_hook_trigger_interface_change
...
Merge pull request 3871
2015-08-23 12:55:00 -07:00
44a43b757d
Merge branch 'fniephaus-_includes' into 'master'
...
* fniephaus-_includes:
Unify renaming of configuration options to a single method. /cc #3782 .
Make _includes directory configurable; closes #2684
2015-08-16 13:30:45 -04:00
399606c544
Unify renaming of configuration options to a single method. /cc #3782 .
2015-08-16 13:30:39 -04:00
559cd6c7e7
Future should be set to false in the default config
2015-08-16 13:11:08 -04:00
2812341c37
Merge branch 'master' of https://github.com/jekyll/jekyll into _includes
...
Conflicts:
bin/jekyll
2015-08-09 16:22:33 +01:00
ac56e9dd16
Make _includes directory configurable; closes #2684
...
and rename `plugins`, `layouts` and `data_source` directories for consistency
2015-08-09 16:20:58 +01:00
371ca58e69
Fixes #3776 by changing to the correct name for whitelisting.
2015-08-05 00:20:14 +02:00
14e6809bcd
Merge pull request #3838 from gynter/issue-3836
...
Merge pull request 3838
2015-07-28 11:29:01 -07:00
7c4f319442
#3870 trigger hooks by owner symbol
2015-07-27 16:23:07 -07:00
1eb626b1df
Fix keep_files not to match a file with repeated path.
2015-07-13 19:08:11 -05:00
3b60237cb1
Fix keep_files to be used as paths relative to the destination.
...
They were used as keywords to match files containing them in the paths.
2015-07-13 18:34:40 -05:00
8bdfdae0ab
Fix reading of binary metadata file
2015-07-09 13:40:36 -04:00
b9f8fc1715
Fixes #3836 . Fix site template header menu iteration variables
2015-07-06 21:02:56 +03:00
f4bbbd6952
Fixed an unclear code comment
2015-07-06 10:43:28 -07:00
5bf5c36ce0
Close #3833 by removing execute bit.
2015-07-04 04:59:06 -05:00
3a49770ce2
Merge pull request #3823 from 18F/adapt-static-file
...
Adapt StaticFile for collections, config defaults
2015-07-01 12:06:08 -05:00
6d196275fc
Add build options ( fixes #3744 )
2015-06-30 20:53:31 +02:00
250b6ebb7e
Adapt StaticFile for collections, config defaults
...
This enables files such as images and PDFs to show up in the same relative
output directory as other HTML and Markdown documents in the same collection.
It also enables static files to be hidden using defaults from _config.yml in
the same way that other documents in the same collection and directories may
be hidden using `published: false`.
2015-06-29 19:58:27 -04:00
8c9e9497a2
Release 💎 3.0.0.pre.beta8
2015-06-29 14:33:38 -07:00
3c656ae2ed
Remove unnecessary 'ensure' in LiquidRenderer
2015-06-23 21:27:24 +00:00
5647b91689
Release 💎 3.0.0.pre.beta7
2015-06-18 20:52:40 -07:00
8b44a7bb42
Merge pull request #3762 from fw42/liquid_profiler
...
Merge pull request 3762
2015-06-16 10:21:33 -07:00
137efdc9f4
Fix : #3738 ; Move code wrapper from div to figure.
2015-06-10 15:20:44 -05:00
a58f23aeaf
Add support for underscores.
2015-06-10 15:05:17 -05:00
34438ed325
Refactor: lib/jekyll/convertor/markdown.rb - tests: no additions/breaks.
...
Reason: #3770
2015-06-10 15:04:25 -05:00
7bc9e1aae6
Add byte counter
2015-06-07 16:49:22 +00:00
1e9163fdf4
Liquid profiler
2015-06-07 16:38:05 +00:00
e9215ec047
Merge pull request #3732 from jekyll/fix-frontmatter-defaults
...
Fix it so that 'blog.html' matches 'blog.html'
2015-06-06 06:30:43 -05:00
a134e05fda
Release 💎 3.0.0.pre.beta6
2015-06-04 16:57:13 -07:00
bba7870f8b
Merge pull request #3717 from alfredxing/regenerator-handle-deleted-files
...
Merge pull request 3717
2015-05-31 11:10:42 -07:00
e68d18c3cc
Update link in welcome post to talk.jekyllrb.com
...
Previously the link pointed to the jekyll-help repository on github
which no longer accepts issues.
2015-05-28 21:19:24 +02:00
14ed5cc954
Fix it so that 'blog.html' matches 'blog.html'
2015-05-25 02:07:21 -05:00
a2ee820609
Regenerator: handle deleted/renamed/moved dependencies
...
Should fix #3716
2015-05-19 22:47:58 -07:00
376c87b62e
Don't crash when reading/writing Marshal
2015-05-19 15:51:55 +00:00
73db98c244
Release 💎 3.0.0.pre.beta5
2015-05-19 10:54:37 +07:00
498ea4fd24
Merge pull request #3706 from fw42/marshal_metadata
...
Performance: Marshal metadata
2015-05-18 09:17:42 -05:00
3474481043
Marshal metadata
2015-05-18 14:02:43 +00:00
5928618de1
Performance: Sort files only once
2015-05-18 13:56:56 +00:00
ae11cae659
Fix #3653 : Add a doctor helper to test pwd's.
2015-05-17 02:46:40 -05:00
15c4d9bee2
Jekyll::Cleaner#existing_files: Call keep_file_regex and keep_dirs only once, not per iteration
2015-05-11 22:01:10 +00:00
ba12d28fbe
Release 💎 v3.0.0.pre.beta4
2015-05-10 01:10:57 -07:00
ce9fcfaebb
Merge pull request #3553 from stevecrozz/jekyll-hooks
...
Merge pull request 3553
2015-05-09 23:58:46 -07:00
f99abc5314
Cache Document#to_liquid
2015-05-10 03:51:50 +00:00
4b038259c7
Release 💎 v3.0.0.pre.beta3
2015-05-06 23:19:23 -07:00
79a178f7f1
move document.post_render hook to after render call
2015-05-03 13:53:28 -07:00
736e6a78f1
address code review feedback from #3553
...
- change site:reset to site:after_reset
- raise an exception when registering uncallable hook
- set default hook priority at the public API level
2015-05-02 15:56:19 -07:00
245d9677d7
Refine hook implementation
...
- hooks are registered to symbol owners rather than classes directly
- during registration, add the ability to specify owner as an array to
register the same hook to multiple owners
- add optional priority during registration as a symbol (:low, :normal,
:high)
- implement hooks for collections as they are in octopress-hooks, aside
from post_init
2015-05-01 19:00:37 -07:00
6ca9633354
prototype of jekyll hooks, encapsulated
2015-05-01 14:35:15 -07:00
8546298047
fix collections output, see #2346
2015-04-29 10:49:06 -07:00
9ab3c201c8
Remove relative permalinks
2015-04-28 14:03:20 -07:00
269662d0f0
DRY config value fetching
...
Adds #get_config_value_with_override, refactoring the three fetch
methods to use it.
2015-04-18 16:59:36 -07:00
9c03fc3f27
Set logging to debug when verbose flag is set
...
Adds Jekyll::LogAdapter#adjust_verbosity which ensures that --quiet
always wins.
2015-04-18 16:57:57 -07:00
f908051aa4
mime.types: remove extraneous hyphen before comment
2015-04-14 17:15:08 -07:00
ab83f0bf2e
Merge pull request #3649 from schneems/schneems/utf8-myhomework
...
Merge pull request 3649
2015-04-14 16:51:21 -07:00
701617cb0e
Fix header for RSS feeds with UTF8 characters.
...
```
$ curl http://localhost:4000/feed.xml -I
HTTP/1.1 200 OK
Etag: 64af8c-2356-552805aa
Content-Type: text/xml; charset=utf-8
Content-Length: 9046
Last-Modified: Fri, 10 Apr 2015 17:17:30 GMT
Server: WEBrick/1.3.1 (Ruby/2.2.1/2015-02-26)
Date: Fri, 10 Apr 2015 17:17:34 GMT
Connection: Keep-Alive
```
Originally contributed to https://github.com/fitztrev/jekyll-utf8/pull/3
2015-04-14 18:21:25 -04:00
0072865512
Merge pull request #3629 from justinweiss/lsi_search_on_posts
...
Merge pull request 3629
2015-04-14 13:13:24 -07:00
ff3edbc16b
static files mtime liquid should return a Time obj
2015-04-14 11:52:25 -07:00
5a60adb6bd
Maruku deprecation error message
2015-04-14 10:58:47 -07:00
ae039663b9
Remove Maruku and references to it
2015-04-14 10:58:47 -07:00
c76c4e478b
Convertible#read_yaml should return self.data.
...
Broken in 4b108df3ab
2015-04-11 15:42:58 -04:00
4b108df3ab
convertible: abort with an error if Page/Post#data isn't a hash.
...
when the default_proc was being assigned, it failed if it wasn't a Hash. We
expect data to be a Hash everywhere, so let's freak out if it isn't after
reading and applying the fallback.
Fixes #3643 .
2015-04-10 17:07:14 -04:00
bf98004843
Merge pull request #3608 from nickburlett/patch/incremental-build
...
Merge pull request 3608
2015-04-10 16:51:56 -04:00
eeb13872e3
Merge branch 'delftswa2014-remove-unused-method'
...
* delftswa2014-remove-unused-method:
static_file: extract extname in initializer and save as variable. #3632
removed unused method StaticFile::extname
2015-04-10 16:31:26 -04:00
f14af82da5
static_file: extract extname in initializer and save as variable. #3632
2015-04-10 16:31:19 -04:00
76416e50e8
Add WOFF2 font format
2015-04-10 00:13:02 +02:00
f0cac685de
removed unused method StaticFile::extname
2015-04-01 12:57:49 +02:00
fa435fae94
Use `Jekyll::Post`s for both LSI indexing and lookup.
...
When looking for related posts, Jekyll was indexing `Jekyll::Post`
objects, but finding related posts based on `Jekyll::Post#content`. This
caused two problems:
1. Ruby 2.2 will warn on == if <=> throws an exception (and future Ruby
versions will surface that exception). Because `String`s can't be
compared with `Jekyll::Post`s, this warning was appearing all the time
while searching for related posts.
2. LSI won't return a post itself when searching for related posts. But
LSI could never tell that we were searching on a post, since Jekyll
passed post content, not a post object. With this fix, we can remove the
`- [post]` from `Jekyll::RelatedPosts#find_related`.
This is a more accurate fix for #3484 .
2015-03-29 23:43:55 -07:00
f75346c799
Merge pull request #3614 from nickburlett/patch/incremental-build-dest-missing
...
Incremental build if destination file missing
2015-03-28 19:26:01 -05:00
1f8157022a
Clean up destination modified check
...
Clean up the destination modified check in `source_modified_or_dest_missing?` to be easier to read. Note that it can now return `nil` instead of `false` for an unmodified `source_path` and a `nil` `dest_path`, but in a discussion on 706007ead9
2015-03-25 08:51:58 -07:00
d98047ef74
Removed the word 'Jekyll' a few times from the comments
2015-03-25 08:49:05 +01:00
8f4194eea5
Clean up regeneration missing-destination checks
...
Use easier-to-follow checks for missing-destinations in the regenerator.
2015-03-24 21:21:37 -07:00
e7d0b6c5a5
Merge pull request #3545 from delftswa2014/site_extract_readers
...
Merge pull request 3545
2015-03-23 19:53:07 -07:00
d4b8f0d9dd
Process metadata for all dependencies
...
When adding a dependency, also add the dependency to the metadata hash.
Addresses part 1 of #3591 . Prior to this fix, the regnerator only paid attention the mtime of the first dependency it checked, so for posts/pages with N multiple dependencies (i.e., every layout file used to render them), it continues to regenerate the post/page approximately N times, at which point it's seen all of the dependencies.
2015-03-22 13:33:12 -07:00
e91527058a
Merge pull request #3592 from nickburlett/patch/incremental-build
...
Merge pull request 3592
2015-03-21 19:29:45 -07:00
706007ead9
Incrementally regenerate missing destination file
...
Addresses the third point of #3591 , in which the incremental regenerator doesn't notice that destination files have gone missing.
2015-03-21 19:25:02 -07:00
63a1ec8949
Made corrections as suggested by @mattr-.
...
- Corrected TomDoc, added variables and fixed typos.
- deprecated_rel_permalink -> relative_permalinks_are_deprecated.
- Grouped calls together in @reader.read.
- Removed dynamic and static reader subdirectories.
- Removed unnecessary move of limit_posts.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-20 12:41:19 +01:00
324748a5a6
Added corrections as suggested by @parkr.
...
- Replaced occurrences of #array += with concat
operations.(performance)
- Corrected alignment.
- Removed rebase artifact.
Signed-off-by: Martin Rogalla <martin@martinrogalla.com>
2015-03-19 14:56:46 +01:00
15ebf929e1
Use the new clear_cache method
...
Instead of assigning `@cache = {}`, clear the cache using `clear_cache`
2015-03-18 22:30:31 -07:00
adce349d7a
Clear the regenerator cache every time we process
...
To address part of #3591 , clear the regenerator's cache every time the
site is processed. This ensures that the regenerator doesn't incorrectly
believe a file hasn't changed based on stale information.
2015-03-18 10:27:40 -07:00
e268ee0f33
Whoops, forgot the pre in the beta tag.
2015-03-18 05:25:36 -05:00
eb2fc89776
Correct the semantics of checking for jekyll-paginate
2015-03-16 15:48:50 -07:00
Pat Hawks
Parker Moore
Anatoliy Yastreb
Brint O'Hearn
jekyllbot
TheLucasMoore
Derek Gottlieb
Jordon Bedwell
skim
Thomas Wood
Jussi Kinnula
Pierre Fenoll
Florian Thomas
Ben Balter
surrim
Shinn Kondo
Jeff Kolesky
Mike Linksvayer
Matt Rogers
Zack Spencer
Hugo Giraudel
Chayoung You
Tony Garnock-Jones
timwis
Henry Goodman
atomicules
lonnen
rebornix
Zshawn Syed
Pedro Euko
Peter Suschlik
William Entriken
leethomas
James Wen
Ducksan Cho
Sasha Friedenberg
Sam Volin
Tim Cuthbertson
Larry Fox
chrisfinazzo
Will Norris
Paul Robert Lloyd
Alfred Xing
Tunghsiao Liu
BigBlueHat
Marcus Stollsteimer
Kevin Locke
hartmel
David Herman
Nate Berkopec
Fabio Niephaus
Robert Papp
Stephen Crosby
Florian Weingarten
Günter Kits
Jensen Kuras
Lukas
Mike Bland
Seb
Bernardo Dias
Jim Meyer
schneems
Nicolas Hoizey
Martijn den Hoedt
Justin Weiss
Nicholas Burlett
Martin Jorn Rogalla