6e0119d5e1
Merge pull request #5164 from jekyll/fix-windows-error
...
Merge pull request 5164
2016-08-01 17:34:52 -07:00
95e9774100
Merge pull request #5156 from jekyll/theme-source-fix
...
Merge pull request 5156
2016-08-01 17:27:02 -07:00
d4e18fc979
Layout: set relative_path without using Pathname
...
Presently, on a Windows machine, you get an ArgumentError on Windows:
Generating...
C:/Ruby23-x64/lib/ruby/2.3.0/pathname.rb:520:in `relative_path_from':
different prefix: "/" and "C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/minima-1.0.1" (ArgumentError)
from C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/jekyll-3.2.0/lib/jekyll/layout.rb:61:in `relative_path'
from C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/jekyll-3.2.0/lib/jekyll/renderer.rb:161:in `place_in_layouts'
from C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/jekyll-3.2.0/lib/jekyll/renderer.rb:71:in `run'
This doesn't affect filesystems which do not use drive names.
2016-07-29 12:16:06 -07:00
8e25b8bffb
Merge pull request #5152 from jekyll/theme-dir-regex-fix
...
Merge pull request 5152
2016-07-28 14:02:10 -07:00
909800839c
Missing trailing |
2016-07-28 16:31:20 -04:00
9220c5a634
Also include LICENSE and README
2016-07-28 15:43:45 -04:00
8b69c6f0b5
resolve theme root before sanitizing
2016-07-28 15:12:31 -04:00
2351ef6bbe
dont double sanitize theme folder paths
2016-07-28 14:46:05 -04:00
54281530fb
Revert "Readability: lib/jekyll/static_file.rb."
...
This reverts commit 26f1ea2487
2016-07-28 13:15:29 -05:00
1bf47ec394
include theme directories in default gemspec
2016-07-28 10:21:30 -04:00
26f1ea2487
Readability: lib/jekyll/static_file.rb.
2016-07-27 23:59:50 -05:00
07518d9540
Release 💎 3.2.0
2016-07-27 17:17:14 -07:00
7e34be945a
Remove mention of rake preview for theme README.
2016-07-26 17:34:52 -07:00
a31766d329
ThemeBuilder: do not create example site & Rakefile
...
They're unnecessary -- the theme _is_ a Jekyll site. Just use jekyll build.
2016-07-26 17:32:18 -07:00
deab138f23
site template: update link to jglovier/jekyll-new to jekyll/minima
2016-07-26 15:37:26 -07:00
41a99b300d
Merge pull request #5137 from jekyll/pull/fixes-for-rubocop-0-42
...
Merge pull request 5137
2016-07-25 17:45:51 -07:00
4b698747dc
Style fixes for Rubocop 0.42.0
...
- var == 0 becomes var.zero?
- when defining method_missing, also define respond_to_missing?
2016-07-25 12:46:43 -07:00
6b0b6418dc
Merge pull request #5135 from chrisfinazzo/baseurl-subcommand
...
Merge pull request 5135
2016-07-25 12:26:02 -07:00
0f3ce73516
Merge pull request #4860 from pathawks/pr/where_exp
...
Merge pull request 4860
2016-07-25 12:16:55 -07:00
57944c3da4
Merge pull request #5127 from ayastreb/date-filter-fix
...
Merge pull request 5127
2016-07-25 10:42:28 -07:00
810e411bdf
Merge pull request #5129 from stevecheckoway/display-liquid-warnings
...
Merge pull request 5129
2016-07-25 10:41:54 -07:00
ed3f745b77
Add baseurl subcommand, fixes #4919
2016-07-25 10:15:15 -04:00
0e0e9f2081
Fix script/fmt error in site.rb.
2016-07-24 19:27:21 -07:00
9f02ec6cf8
Release v3.2.0.pre.beta2
2016-07-24 16:43:28 -07:00
8d4ab9366e
Show liquid warnings.
2016-07-24 13:04:28 -05:00
9176924eab
filters: raise error if no input given to date filters
2016-07-24 01:37:35 +03:00
f8aea7b35c
Merge pull request #5109 from mojavelinux/issue-4858
...
Merge pull request 5109
2016-07-21 11:43:38 -07:00
d590d7a738
resolves #4858 pass site instance to watch plugin
...
- prevents the watch plugin from creating a new site instance
2016-07-19 23:21:28 -06:00
5ca080ac6f
Whitespace cleanup.
2016-07-18 21:31:17 +03:00
cfeb54d4be
Merge pull request #5022 from ayastreb/collection
...
Merge pull request 5022
2016-07-15 19:39:42 -07:00
ed98597d49
Merge pull request #5106 from ayastreb/after_init_hook
...
Merge pull request 5106
2016-07-15 19:24:02 -07:00
eb88aa330c
Merge pull request #5060 from stomar/stringify-overrides
...
Merge pull request 5060
2016-07-15 17:26:14 -07:00
3ae7d0c319
Merge pull request #5101 from crispgm/dev_to_integer_filter
...
Merge pull request 5101
2016-07-15 09:58:08 -07:00
b9f232e5bf
rubocop: fix methods naming and indentation
2016-07-15 10:59:44 +03:00
b88f0a21d6
hooks: move after_init hook call at the end of Site.initialize
2016-07-15 10:31:02 +03:00
4dee1f6aa7
Merge pull request #5053 from stevecheckoway/strict-liquid
...
Merge pull request 5053
2016-07-14 19:55:08 -07:00
20b3758edb
Add to_integer filter
...
Add to_integer filter
Fix test_filter: parenthesize the method
Fix offense: seperate every 3 digits with _
rubocop:disable Metrics/ModuleLength
More descriptive exception
Fix fmt error
Remove if stmt for integer input
Remove rescue for to_i
Remove error message assert
2016-07-15 08:38:36 +08:00
f417cf8a0f
Merge pull request #5042 from jekyll/fix-more-theme-things
...
Fix more theme things
2016-07-14 17:14:41 -07:00
99663a9199
object needs to respond to select instead of being an enumerable
2016-07-14 13:11:09 -05:00
73223f3a5a
Fix Rubocop warnings
2016-07-14 12:15:00 +02:00
0e8f204011
Fix #3926 post_url helper with sub-directories
...
Instead of matching the the value provided to `post_url` against
the basename, test against the relative path.
Updated the regexp to match both
* _posts/category
* category/_posts
2016-07-14 11:53:58 +02:00
695b5396fd
rubocop: fix code style
2016-07-14 09:23:05 +03:00
1f366730f8
Merge pull request #5069 from Crunch09/issue-2834
...
Merge pull request 5069
2016-07-12 19:50:32 -07:00
146d0f301d
Merge pull request #5067 from jekyll/excerpt-drop-previous-doc
...
Merge pull request 5067
2016-07-11 11:20:22 -07:00
cc82d44222
check if relative URL contains a colon
...
fixes #2834
2016-07-08 20:33:47 +02:00
1c0f21230d
Stringify configuration overrides before first use
...
This makes sure that overrides for Jekyll.configuration
all have string keys before their first use, particularly
also the "config" and "skip_config_files" options.
2016-07-08 15:47:26 +02:00
e3214c23a3
Add missing elements to Excerpt which delegate to its Document
2016-07-07 13:37:09 -07:00
ba08e17204
Extract tag name to class method
2016-07-07 14:41:57 +03:00
3aead1d4a9
Imitate fetch method instead of creating real Hash object
2016-07-06 11:20:37 +03:00
72d49490d2
Add fetch method to Drops
2016-07-05 21:22:24 +03:00
dcc8960806
Enable strict (or lax) liquid parsing.
...
Insert
liquid:
error_mode: strict # or lax or warn
in _config.yml to change the error mode.
2016-07-04 10:16:11 -05:00
0599f114d6
Only add a CODE_OF_CONDUCT.md file if specified.
2016-06-29 15:14:26 -07:00
4b7109d273
Themes won't have executables.
2016-06-29 14:15:02 -07:00
5a1a7e1056
Remove the plugin_theme metadata field. Not useful.
2016-06-29 14:13:09 -07:00
a7d25ed963
Fix rubocop offenses on master.
2016-06-28 22:08:06 -07:00
549371fd4e
Merge pull request #5030 from ayastreb/document-stylefix
...
Merge pull request 5030
2016-06-27 09:48:46 -07:00
8154eb40aa
rubocop: separate deprecator error messages
2016-06-26 16:43:56 +02:00
cdee574782
Merge pull request #5031 from ayastreb/convertible-stylefix
...
Merge pull request 5031
2016-06-25 14:47:29 -07:00
3ccc91430f
rubocop: fix code style
2016-06-25 15:22:36 +03:00
2bbad7cb43
rubocop: fix code style
2016-06-25 15:11:50 +03:00
b156aa912a
rubocop: fix code style
2016-06-25 14:56:12 +03:00
205acb0916
Merge pull request #5024 from ayastreb/configuration
...
Merge pull request 5024
2016-06-23 18:48:25 -07:00
d093c76d35
Merge pull request #5025 from ayastreb/regenerator
...
Merge pull request 5025
2016-06-23 09:32:13 -07:00
9278eb8fce
utils: check that the object is a hash when merging default_proc
...
Follow-up to #5026 .
2016-06-22 12:15:07 -07:00
0b169f7739
rubocop: refactor modified? method
2016-06-22 14:15:13 +03:00
08b883b268
rubocop: fix code style
2016-06-20 16:03:42 +03:00
d13112dbdc
rubocop: fix code style
2016-06-19 18:22:59 +03:00
14e857029a
rubocop: fix code style
2016-06-19 15:48:23 +03:00
5c03e1da3f
Merge pull request #5019 from ayastreb/static_file
...
Merge pull request 5019
2016-06-17 19:42:28 -07:00
7ee99bcd38
Merge pull request #4922 from jekyll/jekyll-new-use-theme
...
Merge pull request 4922
2016-06-16 17:31:53 -07:00
0f74db4131
rubocop: move mtimes cache hash to class variable
2016-06-16 23:12:01 +03:00
7a933893db
rubocop: fix code style
2016-06-16 13:14:50 +03:00
c70ca8ac97
Whoops, forgot the _layouts templates.
2016-06-15 16:04:57 -07:00
765a23468e
Give the user a layout scaffolding.
2016-06-15 15:59:31 -07:00
1dbcf97bef
Fix rubocop offense.
2016-06-15 12:50:54 -07:00
ddf833505c
Fix offense.
2016-06-15 10:33:30 -07:00
713fbb6652
Merge pull request #5009 from nasht00/master
...
Merge pull request 5009
2016-06-15 10:04:37 -07:00
fb1a459ddd
Merge pull request #4917 from pathawks/pr/normalize_whitespace
...
Merge pull request 4917
2016-06-14 14:03:05 -07:00
e85e89bbff
Ensure the minima theme is shipped with a new site.
2016-06-14 11:54:01 -07:00
73f70e9071
Add .bundle to gitignore for the theme
2016-06-14 11:51:26 -07:00
e72bfdab21
theme template: link to the example post instead of just quoting it.
2016-06-14 11:51:01 -07:00
ce1c148898
Rename the jekyll_pessimistic_version theme template method to be more descriptive
2016-06-14 11:46:10 -07:00
ad94182b49
Add .gitignore to theme template.
2016-06-14 11:43:12 -07:00
9f1f70267f
Merge pull request #4993 from ayastreb/filters
...
Merge pull request 4993
2016-06-14 11:23:58 -07:00
3fe9e92c4f
Prevent reset of page to fix #4414
2016-06-14 13:07:26 +03:00
e6dc78b22f
Run Site#generate for 'jekyll doctor' to catch plugin issues.
2016-06-13 13:08:48 -07:00
5f2bb5d0aa
rubocop: fix code style
2016-06-07 20:13:43 +03:00
7197028cd5
Merge pull request #4973 from ayastreb/site
...
Merge pull request 4973
2016-06-06 08:03:36 -07:00
f41bd1bab7
Rubocop cleanup
2016-06-06 16:30:09 +02:00
f5a8000baa
Fix regexp literal issues on master.
2016-06-03 22:10:15 -07:00
8917fa8282
Merge branch 'master' into percent_r
...
* master: (22 commits)
Update history to reflect merge of #4980 [ci skip]
werdz
Use jekyll-mentions and restructure
Add post about GSoC project.
Update history to reflect merge of #4976 [ci skip]
Amend WEBrick default headers documentation
Update history to reflect merge of #4966 [ci skip]
.rubocop.yml - remove lib/jekyll.rb
lib/jekyll.rb - fix offenses reported by rubocop method set_timezone is ignored using rubocop:disable Style/AccessorMethodName
Update history to reflect merge of #4977 [ci skip]
Update history to reflect merge of #4962 [ci skip]
Update history to reflect merge of #4959 [ci skip]
Fixed typo
Changed github-gem to github-pages
Included installation instructions
Installation instructions for github-pages gem
Added link to windows doc page
Fix inaccurate HTTP response header field name
Minor tweak to fix missing apostrophne
Feedback for flubbed regex and prefer File's directory check
...
2016-06-03 22:09:15 -07:00
712e77abd2
lib/jekyll.rb - fix offenses reported by rubocop
...
method set_timezone is ignored using rubocop:disable Style/AccessorMethodName
2016-06-03 09:45:15 +05:30
f5a0db9dcc
Rubocop: use %r for all regular expressions.
2016-06-02 17:08:21 -07:00
986eda335c
Merge pull request #4959 from derekgottlieb/rubocop-theme-and-url
...
Merge pull request 4959
2016-06-02 17:08:04 -07:00
6a07254cbf
Merge pull request #4953 from Crunch09/issue-4850
...
Merge pull request 4953
2016-06-02 16:59:51 -07:00
dc4b91b0c8
Merge pull request #4974 from ayastreb/frontmatter_defaults
...
Merge pull request 4974
2016-06-02 12:06:55 -07:00
e7677bdf51
rubocop: revert has_precedence method rename
2016-06-02 21:25:50 +03:00
597e8ee5d5
rubocop: fix code style
2016-06-02 16:12:16 +03:00
06cff8f781
rubocop: fix code style
2016-06-01 18:20:35 +03:00
db6050768d
Feedback for flubbed regex and prefer File's directory check
2016-05-28 19:23:23 -05:00
03f7bc1a8c
lib/jekyll/url.rb passing rubocop
2016-05-28 17:15:33 -05:00
714c99b418
Convert input to string before markdownify or smartify
2016-05-28 15:19:15 -05:00
b5cec7d335
lib/jekyll/theme.rb passing rubocop
2016-05-28 13:51:13 -05:00
f8c038566c
`Serve.process` should receive same config as `Build.process`
...
fixes #4850
2016-05-27 11:46:04 +02:00
35b3c91b64
Merge branch 'pathawks-readers'
...
* pathawks-readers:
I will chain blocks if I want to chain blocks.
Rubocop: Readers
Rubocop: lib/jekyll/readers/static_file_reader.rb
Rubocop: lib/jekyll/readers/post_reader.rb
Rubocop: lib/jekyll/readers/page_reader.rb
Rubocop: lib/jekyll/readers/layout_reader.rb
Rubocop: lib/jekyll/reader.rb
2016-05-26 16:10:21 -07:00
3a3405fe51
I will chain blocks if I want to chain blocks.
2016-05-26 16:09:56 -07:00
5e46a02d71
Merge branch 'ayastreb-tags'
...
* ayastreb-tags:
rubocop: fix code style
rubocop: fix spacing in code style
rubocop: fix code style
rubocop: fix include tag code style
rubocop: fix post URL tag code style
rubocop: fix link tag code style
rubocop: fix highlight tag code style
2016-05-26 16:05:35 -07:00
8a5148f589
Merge pull request #4948 from pathawks/drops
...
Merge pull request 4948
2016-05-26 16:03:52 -07:00
8d0a4be5e0
Merge pull request #4931 from pathawks/converters
...
Merge pull request 4931
2016-05-26 10:28:21 -07:00
40c6702a0d
Merge pull request #4933 from pathawks/liquid
...
Merge pull request 4933
2016-05-26 10:21:38 -07:00
30eebaf5e0
Rubocop: lib/jekyll/drops/site_drop.rb
2016-05-26 12:04:28 -05:00
87acab9a86
Merge pull request #4950 from pathawks/rubocop/entry_filter
...
Merge pull request 4950
2016-05-26 08:25:55 -07:00
001cbf2c07
rubocop: fix code style
2016-05-26 12:17:31 +03:00
ae71db4693
Rubocop: lib/jekyll/stevenson.rb
2016-05-26 01:04:12 -05:00
d855ec03ba
Rubocop: lib/jekyll/converters/markdown/redcarpet_parser.rb
2016-05-26 00:53:38 -05:00
0880dc097f
Rubocop: lib/jekyll/converters/markdown/kramdown_parser.rb
2016-05-26 00:53:26 -05:00
38eb326b7f
Rubocop: lib/jekyll/converters/markdown.rb
2016-05-26 00:53:15 -05:00
d58c986b2b
Rubocop: lib/jekyll/entry_filter.rb
2016-05-26 00:45:54 -05:00
382be191ae
Rubocop: lib/jekyll/readers/static_file_reader.rb
2016-05-26 00:10:43 -05:00
0696e6c169
Rubocop: lib/jekyll/readers/post_reader.rb
2016-05-26 00:10:31 -05:00
615a9ee9ac
Rubocop: lib/jekyll/readers/page_reader.rb
2016-05-26 00:10:20 -05:00
e85690a61f
Rubocop: lib/jekyll/readers/layout_reader.rb
2016-05-26 00:10:09 -05:00
795bcdef68
Rubocop: lib/jekyll/reader.rb
2016-05-26 00:09:46 -05:00
4c35d15a3b
Rubocop: lib/jekyll/liquid_renderer/table.rb
2016-05-26 00:07:52 -05:00
3e42e6d461
Rubocop: lib/jekyll/liquid_renderer.rb
2016-05-26 00:07:43 -05:00
746e360c63
Delimeters, delimeters, delimeters.
2016-05-25 18:03:25 -07:00
34d172007b
Merge branch 'pathawks-rubocop/misc'
...
* pathawks-rubocop/misc:
Fix Page#relative_path so that it consistently does NOT have the prepending slash (previously inconsistent)
Rubocop cleanup for lib/jekyll/layout.rb
Rubocop cleanup for lib/jekyll/plugin_manager.rb
Rubocop cleanup for lib/jekyll/page.rb
2016-05-25 17:57:52 -07:00
4fbbeddae2
Fix Page#relative_path so that it consistently does NOT have the prepending slash (previously inconsistent)
...
Fixes for #4946
2016-05-25 17:57:09 -07:00
6f1e1d80cd
Rubocop: drop changes from v3.1 forward-ports
2016-05-25 16:10:11 -07:00
e56e58e498
Merge branch 'master' into pathawks-fp/jsonify-drops
...
* master: (38 commits)
Mention where it came from. [ci skip]
Update history to reflect merge of #4944 [ci skip]
Update history to reflect merge of #4943 [ci skip]
Mention where it came from. [ci skip]
Update history to reflect merge of #4942 [ci skip]
Update history to reflect merge of #4941
External: remove &block arg, use block_given?
Update history to reflect merge of #4936 [ci skip]
lib/jekyll.rb: require document_drop to ease our pain
Sort the results of the require_all glob.
Rubocop fixes
Reset {{ layout }} between each render & merge layout data properly
Add failing test for layout data inheritance bug (#4433 )
Add failing test for layout bug (#4897 )
Fix tests for plugins in configuration.
Define Drop#each so we can use the new frozen/duping behavior
Don't default 'include' and 'exclude' to an empty array
Fix some minor things in the tests
Freeze configuration defaults & duplicate in deep_merge_hashes if need be.
Remove merge conflicts I forgot to fix.
...
2016-05-25 15:55:47 -07:00
dc5fd15f71
Merge pull request #4944 from pathawks/fp/sort-includes
...
Merge pull request 4944
2016-05-25 15:46:50 -07:00
0ca45a48e5
Merge pull request #4943 from pathawks/fp/fix-layout-var-overflow
...
Merge pull request 4943
2016-05-25 15:44:23 -07:00
cf810a88fa
Merge pull request #4942 from pathawks/fp/configuration-from-permalink-fix
...
Merge pull request 4942
2016-05-25 15:42:05 -07:00
2caf8e0621
rubocop: fix spacing in code style
2016-05-25 21:48:21 +03:00
5c036cf3c4
rubocop: fix code style
2016-05-25 20:24:19 +03:00
10543e7c46
Merge branch 'pathawks-fp/ExcerptDrop'
...
* pathawks-fp/ExcerptDrop:
Rubocop fixes
excerpt drop should give access to document's layout
look up the content methods for drops in a smarter way
Use require_relative
Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid
2016-05-25 09:31:27 -07:00
de39107c76
Rubocop cleanup for lib/jekyll/layout.rb
2016-05-25 11:28:46 -05:00
65e78b3280
Rubocop cleanup for lib/jekyll/plugin_manager.rb
2016-05-25 11:27:43 -05:00
3a04093e51
Rubocop cleanup for lib/jekyll/page.rb
2016-05-25 11:27:29 -05:00
733c56a65e
External: remove &block arg, use block_given?
...
Addresses my comment in https://github.com/jekyll/jekyll/pull/4936#discussion_r64598949
2016-05-25 08:55:12 -07:00
2ca80920dc
rubocop: fix include tag code style
2016-05-25 13:15:04 +03:00
17d8c96a63
Add ability to render drops as JSON
...
Previously you could do, e.g. {{ site | jsonify }}, but with the introduction of Liquid Drops, this didn't work anymore.
This PR adds the ability to render drops as JSON. You can safely run drop.to_json and it should Do the Right Thing.
2016-05-24 19:08:46 -05:00
ad7bd84098
lib/jekyll.rb: require document_drop to ease our pain
2016-05-24 19:03:32 -05:00
1a05483a63
Sort the results of the require_all glob.
...
Filesystems behave differently when performing glob listings.
In my environment, they are listed alphabetically. On my Mac, when asking for a list of files in a directory, those files are returned as a nicely sorted list. Alphabetized, like you'd want them to be. Like you'd expect them to be.
In some environments, quite different from my own, the return of a similar operation is quite random. Perhaps q comes before a, or e before d; the filesystem will choose its order of the day and you, the fare user, tired and weary from work, must bare the brunt of this.
And so, with this commit, I do hereby request that the noble makers of Dir[] provide for us, the downtrodden and ravaged users, some consistency. As a user of Ruby, I shouldn't have to know or consider the behaviour of an individual filesystem here; it should function the same for all filesystems.
Truly yours,
Parker
2016-05-24 19:03:32 -05:00
db7cd6f612
Reset {{ layout }} between each render & merge layout data properly
2016-05-24 18:57:54 -05:00
7641971d7e
Fix tests for plugins in configuration.
2016-05-24 18:49:06 -05:00
48274244e3
Define Drop#each so we can use the new frozen/duping behavior
2016-05-24 18:49:06 -05:00
d5c3785d29
Don't default 'include' and 'exclude' to an empty array
2016-05-24 18:49:06 -05:00
de5970ae55
Fix some minor things in the tests
2016-05-24 18:49:05 -05:00
d84844c223
Freeze configuration defaults & duplicate in deep_merge_hashes if need be.
2016-05-24 18:49:05 -05:00
jekyllbot
Parker Moore
Ben Balter
Jordon Bedwell
chrisfinazzo
Stephen Checkoway
Anatoliy Yastreb
Dan Allen
XhmikosR
David Zhang
Florian Thomas
Marko Locher
Marcus Stollsteimer
Nathan Hazout
DirtyF
Praveen Kumar
Derek Gottlieb
Pat Hawks
Brint O'Hearn