dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,362 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

2790 Commits

Author SHA1 Message Date
Parker Moore 8e91263031
StaticFile#copy_entry: don't mark modified time if path is a symlink 2016-09-28 16:55:57 -07:00
jekyllbot 6847b604c8 Merge pull request #5157 from stevecheckoway/fix-hooks-priority-order 
Merge pull request 5157
 2016-09-28 16:39:44 -07:00
jekyllbot 9c197d9555 Merge pull request #5210 from jekyll/node-must-die 
Merge pull request 5210
 2016-09-28 16:38:00 -07:00
jekyllbot 0f70bb1320 Merge pull request #5408 from ashmaroli/bundle2new 
Merge pull request 5408
 2016-09-28 16:31:08 -07:00
Parker Moore 06651c960a Merge pull request #5325 from ashmaroli/gemspec-template-patch 
update gemspec template to include only required theme files
 2016-09-27 11:30:58 -07:00
Frank Taillandier 6dbb5e2df1
add contextual help for overriding theme's default 2016-09-27 11:27:29 +02:00
Frank Taillandier c4ccfae3af
rename index.html to index.md 
fix https://github.com/jekyll/minima/issues/13
 2016-09-27 11:12:29 +02:00
Frank Taillandier 8321b14b29
Move contents of the index.html page to the 'home' layout 2016-09-27 08:24:58 +02:00
Pat Hawks 2b30c06140
Use Addressable to better deal with i18n URLs 2016-09-24 15:34:00 -05:00
Ashwin Maroli 3966a37d71 swallow bundle output in CI 2016-09-24 13:48:22 +05:30
Heng Kwokfu db53213d16 Merge remote-tracking branch 'jekyll/master' into patch-1 2016-09-24 08:46:24 +08:00
jekyllbot aaa062b047 Merge pull request #5402 from ashmaroli/jekyll-new-assets 
Merge pull request 5402
 2016-09-23 14:30:39 -07:00
jekyllbot 8197e17495 Merge pull request #5399 from jekyll/relative_url_and_absolute_url 
Merge pull request 5399
 2016-09-23 14:18:01 -07:00
Ashwin Maroli 0dc15dba88 remove `css/` from new site scaffolding 
css directory and its contents to be handled by theme's `assets/`
directory.
The directory removed here wil be added to minima gem.
 2016-09-23 18:00:13 +05:30
Parker Moore fa96843555
URLFilters: Simplify ensure_leading_slash calls. 2016-09-22 20:58:26 -07:00
jekyllbot 992be253a6 Merge pull request #5338 from ashmaroli/config-patch 
Merge pull request 5338
 2016-09-22 20:50:47 -07:00
Parker Moore eab6752f52
Consolidate ensure_leading_slash to 2 lines. 2016-09-22 14:40:20 -07:00
Parker Moore aa86651650
Add absolute_url and relative_url filters. 2016-09-22 14:16:00 -07:00
Ashwin Maroli 99fc60e28c update template to include theme files 2016-09-21 06:29:34 +05:30
jekyllbot 3a7cbadd82 Merge pull request #5375 from Nicop06/underscore_highlight 
Merge pull request 5375
 2016-09-20 17:05:49 -07:00
jekyllbot ee84a95a38 Merge pull request #5376 from jonblatho/master 
Merge pull request 5376
 2016-09-20 17:04:57 -07:00
jekyllbot cfe61771e0 Merge pull request #5380 from ethomson/coderay_deprecation 
Merge pull request 5380
 2016-09-20 16:39:33 -07:00
jekyllbot 504411e476 Merge pull request #5237 from ashmaroli/bundle2new 
Merge pull request 5237
 2016-09-20 15:32:25 -07:00
Parker Moore 279f1516d2
Merge branch 'master' into themes-asset-folder 
* master:
  Update history to reflect merge of #5381 [ci skip]
  Update history to reflect merge of #5383 [ci skip]
  run features on windows
  Appease Rubocop
  Update history to reflect merge of #5372 [ci skip]
  Add missing period to sentence in first paragraph.
 2016-09-20 13:13:01 -07:00
Parker Moore 7309ecf8e1
Theme: for various path helpers, use strings. Symbols confuse people. 2016-09-19 13:47:51 -07:00
Pat Hawks 3bfdc00d14
Appease Rubocop 2016-09-19 13:15:02 -05:00
Jonathan Thornton f2bfc832a0 Marking filename with backticks as suggested 2016-09-19 12:08:20 -05:00
Edward Thomson 054b23f69a Only complain about `coderay` if it is actually in the config 
Don't complain about the deprecated `kramdown.coderay` key when
`highlighter == "coderay"`, since that could have been set with the
legitimate `syntax_highlighter: coderay` setting.  Instead, complain
only if the `kramdown.coderay` configuration setting is actually
present.
 2016-09-19 11:38:05 -05:00
Nicolas Porcel 0b94cf3fa1 Allow underscore in highlighter language 2016-09-19 13:10:29 +02:00
Jonathan Thornton 1a11536a2c Clarify documentation in README 
This change is subtle, but may prove greatly useful to Jekyll newbies
 2016-09-18 17:38:28 -05:00
Parker Moore 74baeb889a
ThemeAssetsReader: fix tests so everything passes. 2016-09-18 15:04:15 -04:00
Parker Moore 87b9cfe2b5
ThemeBuilder: add 'assets' to list of scaffold directories 2016-09-16 14:57:58 -07:00
Parker Moore 13aec48137
Add ThemeAssetsReader which reads assets from a theme 
If the theme includes the 'assets' directory, it will be walked and items will be added to the site based
on the normal rules of Jekyll: if there is YAML front matter, it will be added as a (convertible) Page,
otherwise it will be added as a StaticFile.
 2016-09-16 14:41:36 -07:00
Parker Moore b8f17b9034
Exclude node_modules by default 
If no 'exclude' directive is specified, exclude node_modules by default.

https://twitter.com/mxstbr/status/761856359579185153
 2016-09-16 13:09:10 -07:00
Frank Taillandier 59b61c3f9f Exclude vendor by default 2016-09-16 07:56:37 +02:00
jekyllbot 4888b84b44 Merge pull request #5199 from jeffkole/adds-linking-to-all-files 
Merge pull request 5199
 2016-09-13 07:11:50 -07:00
Ashwin Maroli 566b42b8b3 add `bundle install` to `jekyll new` 
- automatically run `bundle install` from within the newly generated blog
   directory by default.
 - add a new switch to skip this default behaviour.
 2016-09-13 08:43:13 +05:30
jekyllbot 3e0363be4a Merge pull request #5326 from ashmaroli/gitignore-gem 
Merge pull request 5326
 2016-09-09 13:53:28 -07:00
jekyllbot a70abbeab5 Merge pull request #5337 from jekyll/fix-convertible-5308 
Merge pull request 5337
 2016-09-08 11:27:35 -07:00
Ashwin Maroli 8813173ba7 set empty url in config file by default 2016-09-08 15:47:28 +05:30
Parker Moore c1e6f1fb94
Fix rubocop errors & add one more test for slugify 'ascii' mode (#4680) 2016-09-07 17:50:14 -07:00
Parker Moore 9164973a6c
Merge branch 'jussikinnula-master' 
* jussikinnula-master:
  Fix slugify test
  One final "urlsafe" replaced with "ascii"
  Change urlsafe to ascii also when actually slugifying
  Add tests for ascii slugify mode
  Rename urlsafe to ascii, and document it (on utils.rb)
  Add urlsafe to accepted slugify modes
  Add urlsafe method for slugify
 2016-09-07 16:50:32 -07:00
jekyllbot dddafccb36 Merge pull request #5235 from jekyll/update-windows-detection-to-check-proc-version 
Merge pull request 5235
 2016-09-07 16:34:37 -07:00
Parker Moore 3840a38081
Convertible: set self.output in #render_all_layouts and #do_layout 2016-09-07 15:59:43 -07:00
Ashwin Maroli b47db14f86 add future gems to gitignore 2016-09-05 15:14:59 +05:30
Eloy Espinaco 9b09d8a8e8 Add support for indented link references on excerpt 
Excerpt link reference extraction is missing all the indented references
at the bottom of the page. Markdown specify that those can be indented up
to three spaces.
 2016-09-02 17:21:10 -03:00
jekyllbot 2f167aeea7 Merge pull request #5308 from jekyll/rubocop-convertible 
Merge pull request 5308
 2016-09-01 17:18:50 -07:00
Parker Moore 4af0f0262e
Remove layouts named param from Renderer#initialize 2016-09-01 13:26:14 -07:00
jekyllbot 6a34966f20 Merge pull request #5189 from jekyll/skip-theme-if-not-string 
Merge pull request 5189
 2016-08-30 14:54:47 -07:00
Parker Moore a78426f20d
Convertible#read_yaml: disable Metrics/AbcSize check 2016-08-30 14:39:49 -07:00
Parker Moore 9ddc12bad8
Convertible: ensure layouts the argument and payload the argument are set properly in the renderer 2016-08-30 14:39:20 -07:00
Parker Moore ac6bbc1906
Renderer#invalid_layout? should check if document is an excerpt 2016-08-30 14:14:52 -07:00
Parker Moore 8014c54ee0
Convertible#converters: sort the converters 2016-08-30 14:14:33 -07:00
Parker Moore 73e79f0049
Proxy Convertible#converters to Renderer#run 2016-08-30 14:14:22 -07:00
Parker Moore 8496e2e8b6
Proxy Convertible#render_liquid to Renderer 2016-08-30 14:14:12 -07:00
Parker Moore d0f57b61d4
Proxy Convertible#transform to Renderer 2016-08-30 14:14:03 -07:00
Parker Moore 741102bd40
Proxy Convertible#converters to Renderer 2016-08-30 14:13:26 -07:00
Parker Moore b781b9967d
Proxy Convertible#render_all_layouts to Renderer.place_in_layouts 2016-08-30 14:04:57 -07:00
jekyllbot 6b121d2d85 Merge pull request #5045 from ayastreb/document-rubocop-fix 
Merge pull request 5045
 2016-08-30 13:34:55 -07:00
Parker Moore 2b15b0b325
Site#configure_theme: don't do anything if theme config is unset; TEST 2016-08-30 12:17:24 -07:00
Parker Moore 4420c3b2af
Make Site#configure_theme more understandable 2016-08-30 11:58:21 -07:00
Frank Taillandier a9da814f17
add basename and name variables for static files 2016-08-27 11:22:24 +02:00
Heng, K. (Stephen) 7892c5e1f3 Fix issue #5276, where path strips root destination dir if filename matches 2016-08-25 18:35:09 +08:00
Anatoliy Yastreb 2183d9d6b4 Implement respond_to_missing? in Document 2016-08-25 12:13:34 +02:00
Anatoliy Yastreb 158e02623a rubocop: reduce code complexity 2016-08-25 11:22:40 +02:00
David Zhang 9c33754f4f Exclude Gemfile in _config.yml template 2016-08-25 14:54:59 +08:00
Frank Taillandier 326332a5d5
Rename filename to name 2016-08-21 21:32:26 +02:00
Frank Taillandier 87c00b2756
Get static filename 2016-08-20 17:42:05 +02:00
Heng, K. (Stephen) 596f5d1af3 Proposed fix for #5192 
Strip drive name only when necessary.
 2016-08-18 12:02:00 +08:00
Ashwin Maroli a9f92278d3 colorize interpolated text in Jekyll.logger.info 2016-08-16 22:50:54 +05:30
Jordon Bedwell f1f8319566
Fix #5233: Increase our ability to detect Windows. 
This increases our ability to detect Windows, and to detect Windows+Bash.  It also adds a message to Windows for users who try to "--watch", also noting to to them to check out the Windows ticket so eventually somebody pings us if this issue is fixed. /cc @TAGraves
 2016-08-16 03:46:03 -05:00
Parker Moore b937757dce
Site#configure_theme: warn in case the 'theme' config is not a string 2016-08-07 12:03:50 -07:00
Stephen Checkoway 6167c09569 Run hooks in priority order. 
Low priority hooks are being run before higher priority hooks. This is easy to
demonstrate with the following plugin:

    1.upto(10).each do |n|
      Jekyll::Hooks.register :site, :after_reset, priority: Jekyll::Hooks::PRIORITY_MAP[:low] do
        puts "Low #{n}"
      end
      Jekyll::Hooks.register :site, :after_reset, priority: Jekyll::Hooks::PRIORITY_MAP[:normal] do
        puts "Normal #{n}"
      end
      Jekyll::Hooks.register :site, :after_reset, priority: Jekyll::Hooks::PRIORITY_MAP[:high] do
        puts "High #{n}"
      end
    end

Sorting by the negative of the priority and then by the order the hook was
added does the right thing.
 2016-08-06 20:56:34 -05:00
Jeff Kolesky e0ce4a00f8 Fixes `link` tag to work with static files 2016-08-04 20:03:01 -07:00
Jeff Kolesky 82d6657ae8 Adds ability to link to all files 
Fixes request made in #4624 and bug found in #5182
 2016-08-03 15:08:26 -07:00
Ben Balter 58cd8f3f4e use jekyll-feed for default site RSS feed 2016-08-03 12:10:44 -04:00
Parker Moore 2bd592077d
Site#configure_theme: do not set theme unless it's a string 
Some previous ad-hoc 'themes' used this configuration option to store a hash of values.
In that case, we should simply pretend we have no theme.
 2016-08-02 17:11:40 -07:00
Parker Moore 15dc18343c
Add release post for 3.2.1 & update History & version 2016-08-02 16:17:28 -07:00
jekyllbot 6e0119d5e1 Merge pull request #5164 from jekyll/fix-windows-error 
Merge pull request 5164
 2016-08-01 17:34:52 -07:00
jekyllbot 95e9774100 Merge pull request #5156 from jekyll/theme-source-fix 
Merge pull request 5156
 2016-08-01 17:27:02 -07:00
Parker Moore 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
jekyllbot 8e25b8bffb Merge pull request #5152 from jekyll/theme-dir-regex-fix 
Merge pull request 5152
 2016-07-28 14:02:10 -07:00
Ben Balter 909800839c Missing trailing | 2016-07-28 16:31:20 -04:00
Ben Balter 9220c5a634 Also include LICENSE and README 2016-07-28 15:43:45 -04:00
Ben Balter 8b69c6f0b5 resolve theme root before sanitizing 2016-07-28 15:12:31 -04:00
Ben Balter 2351ef6bbe dont double sanitize theme folder paths 2016-07-28 14:46:05 -04:00
Jordon Bedwell 54281530fb
Revert "Readability: lib/jekyll/static_file.rb." 
This reverts commit 26f1ea2487.
 2016-07-28 13:15:29 -05:00
Ben Balter 1bf47ec394 include theme directories in default gemspec 2016-07-28 10:21:30 -04:00
Jordon Bedwell 26f1ea2487
Readability: lib/jekyll/static_file.rb. 2016-07-27 23:59:50 -05:00
Parker Moore 07518d9540
Release 💎 3.2.0 2016-07-27 17:17:14 -07:00
Parker Moore 7e34be945a
Remove mention of rake preview for theme README. 2016-07-26 17:34:52 -07:00
Parker Moore 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
Parker Moore deab138f23
site template: update link to jglovier/jekyll-new to jekyll/minima 2016-07-26 15:37:26 -07:00
jekyllbot 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
Parker Moore 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
jekyllbot 6b0b6418dc Merge pull request #5135 from chrisfinazzo/baseurl-subcommand 
Merge pull request 5135
 2016-07-25 12:26:02 -07:00
jekyllbot 0f3ce73516 Merge pull request #4860 from pathawks/pr/where_exp 
Merge pull request 4860
 2016-07-25 12:16:55 -07:00
jekyllbot 57944c3da4 Merge pull request #5127 from ayastreb/date-filter-fix 
Merge pull request 5127
 2016-07-25 10:42:28 -07:00
jekyllbot 810e411bdf Merge pull request #5129 from stevecheckoway/display-liquid-warnings 
Merge pull request 5129
 2016-07-25 10:41:54 -07:00
chrisfinazzo ed3f745b77
Add baseurl subcommand, fixes #4919 2016-07-25 10:15:15 -04:00
Parker Moore 0e0e9f2081
Fix script/fmt error in site.rb. 2016-07-24 19:27:21 -07:00
Parker Moore 9f02ec6cf8
Release v3.2.0.pre.beta2 2016-07-24 16:43:28 -07:00
Stephen Checkoway 8d4ab9366e Show liquid warnings. 2016-07-24 13:04:28 -05:00
Anatoliy Yastreb 9176924eab filters: raise error if no input given to date filters 2016-07-24 01:37:35 +03:00
jekyllbot f8aea7b35c Merge pull request #5109 from mojavelinux/issue-4858 
Merge pull request 5109
 2016-07-21 11:43:38 -07:00
Dan Allen 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
XhmikosR 5ca080ac6f Whitespace cleanup. 2016-07-18 21:31:17 +03:00
jekyllbot cfeb54d4be Merge pull request #5022 from ayastreb/collection 
Merge pull request 5022
 2016-07-15 19:39:42 -07:00
jekyllbot ed98597d49 Merge pull request #5106 from ayastreb/after_init_hook 
Merge pull request 5106
 2016-07-15 19:24:02 -07:00
jekyllbot eb88aa330c Merge pull request #5060 from stomar/stringify-overrides 
Merge pull request 5060
 2016-07-15 17:26:14 -07:00
jekyllbot 3ae7d0c319 Merge pull request #5101 from crispgm/dev_to_integer_filter 
Merge pull request 5101
 2016-07-15 09:58:08 -07:00
Anatoliy Yastreb b9f232e5bf rubocop: fix methods naming and indentation 2016-07-15 10:59:44 +03:00
Anatoliy Yastreb b88f0a21d6 hooks: move after_init hook call at the end of Site.initialize 2016-07-15 10:31:02 +03:00
jekyllbot 4dee1f6aa7 Merge pull request #5053 from stevecheckoway/strict-liquid 
Merge pull request 5053
 2016-07-14 19:55:08 -07:00
David Zhang 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
Parker Moore f417cf8a0f Merge pull request #5042 from jekyll/fix-more-theme-things 
Fix more theme things
 2016-07-14 17:14:41 -07:00
Florian Thomas 99663a9199
object needs to respond to select instead of being an enumerable 2016-07-14 13:11:09 -05:00
Marko Locher 73223f3a5a Fix Rubocop warnings 2016-07-14 12:15:00 +02:00
Marko Locher 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
Anatoliy Yastreb 695b5396fd rubocop: fix code style 2016-07-14 09:23:05 +03:00
jekyllbot 1f366730f8 Merge pull request #5069 from Crunch09/issue-2834 
Merge pull request 5069
 2016-07-12 19:50:32 -07:00
jekyllbot 146d0f301d Merge pull request #5067 from jekyll/excerpt-drop-previous-doc 
Merge pull request 5067
 2016-07-11 11:20:22 -07:00
Florian Thomas cc82d44222
check if relative URL contains a colon 
fixes #2834
 2016-07-08 20:33:47 +02:00
Marcus Stollsteimer 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
Parker Moore e3214c23a3
Add missing elements to Excerpt which delegate to its Document 2016-07-07 13:37:09 -07:00
Anatoliy Yastreb ba08e17204 Extract tag name to class method 2016-07-07 14:41:57 +03:00
Anatoliy Yastreb 3aead1d4a9 Imitate fetch method instead of creating real Hash object 2016-07-06 11:20:37 +03:00
Anatoliy Yastreb 72d49490d2 Add fetch method to Drops 2016-07-05 21:22:24 +03:00
Stephen Checkoway 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
Parker Moore 0599f114d6
Only add a CODE_OF_CONDUCT.md file if specified. 2016-06-29 15:14:26 -07:00
Parker Moore 4b7109d273
Themes won't have executables. 2016-06-29 14:15:02 -07:00
Parker Moore 5a1a7e1056
Remove the plugin_theme metadata field. Not useful. 2016-06-29 14:13:09 -07:00
Parker Moore a7d25ed963
Fix rubocop offenses on master. 2016-06-28 22:08:06 -07:00
jekyllbot 549371fd4e Merge pull request #5030 from ayastreb/document-stylefix 
Merge pull request 5030
 2016-06-27 09:48:46 -07:00
Anatoliy Yastreb 8154eb40aa rubocop: separate deprecator error messages 2016-06-26 16:43:56 +02:00
jekyllbot cdee574782 Merge pull request #5031 from ayastreb/convertible-stylefix 
Merge pull request 5031
 2016-06-25 14:47:29 -07:00
Anatoliy Yastreb 3ccc91430f rubocop: fix code style 2016-06-25 15:22:36 +03:00
Anatoliy Yastreb 2bbad7cb43 rubocop: fix code style 2016-06-25 15:11:50 +03:00
Anatoliy Yastreb b156aa912a rubocop: fix code style 2016-06-25 14:56:12 +03:00
jekyllbot 205acb0916 Merge pull request #5024 from ayastreb/configuration 
Merge pull request 5024
 2016-06-23 18:48:25 -07:00
jekyllbot d093c76d35 Merge pull request #5025 from ayastreb/regenerator 
Merge pull request 5025
 2016-06-23 09:32:13 -07:00
Parker Moore 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
Anatoliy Yastreb 0b169f7739 rubocop: refactor modified? method 2016-06-22 14:15:13 +03:00
Anatoliy Yastreb 08b883b268 rubocop: fix code style 2016-06-20 16:03:42 +03:00
Anatoliy Yastreb d13112dbdc rubocop: fix code style 2016-06-19 18:22:59 +03:00
Anatoliy Yastreb 14e857029a rubocop: fix code style 2016-06-19 15:48:23 +03:00
jekyllbot 5c03e1da3f Merge pull request #5019 from ayastreb/static_file 
Merge pull request 5019
 2016-06-17 19:42:28 -07:00
jekyllbot 7ee99bcd38 Merge pull request #4922 from jekyll/jekyll-new-use-theme 
Merge pull request 4922
 2016-06-16 17:31:53 -07:00
Anatoliy Yastreb 0f74db4131 rubocop: move mtimes cache hash to class variable 2016-06-16 23:12:01 +03:00
Anatoliy Yastreb 7a933893db rubocop: fix code style 2016-06-16 13:14:50 +03:00
Parker Moore c70ca8ac97
Whoops, forgot the _layouts templates. 2016-06-15 16:04:57 -07:00
Parker Moore 765a23468e
Give the user a layout scaffolding. 2016-06-15 15:59:31 -07:00
Parker Moore 1dbcf97bef
Fix rubocop offense. 2016-06-15 12:50:54 -07:00
Parker Moore ddf833505c
Fix offense. 2016-06-15 10:33:30 -07:00
jekyllbot 713fbb6652 Merge pull request #5009 from nasht00/master 
Merge pull request 5009
 2016-06-15 10:04:37 -07:00
jekyllbot fb1a459ddd Merge pull request #4917 from pathawks/pr/normalize_whitespace 
Merge pull request 4917
 2016-06-14 14:03:05 -07:00
Parker Moore e85e89bbff
Ensure the minima theme is shipped with a new site. 2016-06-14 11:54:01 -07:00
Parker Moore 73f70e9071
Add .bundle to gitignore for the theme 2016-06-14 11:51:26 -07:00
Parker Moore e72bfdab21
theme template: link to the example post instead of just quoting it. 2016-06-14 11:51:01 -07:00
Parker Moore ce1c148898
Rename the jekyll_pessimistic_version theme template method to be more descriptive 2016-06-14 11:46:10 -07:00
Parker Moore ad94182b49
Add .gitignore to theme template. 2016-06-14 11:43:12 -07:00
jekyllbot 9f1f70267f Merge pull request #4993 from ayastreb/filters 
Merge pull request 4993
 2016-06-14 11:23:58 -07:00
Nathan Hazout 3fe9e92c4f Prevent reset of page to fix #4414 2016-06-14 13:07:26 +03:00
Parker Moore e6dc78b22f
Run Site#generate for 'jekyll doctor' to catch plugin issues. 2016-06-13 13:08:48 -07:00
Anatoliy Yastreb 5f2bb5d0aa rubocop: fix code style 2016-06-07 20:13:43 +03:00
jekyllbot 7197028cd5 Merge pull request #4973 from ayastreb/site 
Merge pull request 4973
 2016-06-06 08:03:36 -07:00
DirtyF f41bd1bab7
Rubocop cleanup 2016-06-06 16:30:09 +02:00
Parker Moore f5a8000baa
Fix regexp literal issues on master. 2016-06-03 22:10:15 -07:00
Parker Moore 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
Praveen Kumar 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
Parker Moore f5a0db9dcc
Rubocop: use %r for all regular expressions. 2016-06-02 17:08:21 -07:00
jekyllbot 986eda335c Merge pull request #4959 from derekgottlieb/rubocop-theme-and-url 
Merge pull request 4959
 2016-06-02 17:08:04 -07:00
jekyllbot 6a07254cbf Merge pull request #4953 from Crunch09/issue-4850 
Merge pull request 4953
 2016-06-02 16:59:51 -07:00
jekyllbot dc4b91b0c8 Merge pull request #4974 from ayastreb/frontmatter_defaults 
Merge pull request 4974
 2016-06-02 12:06:55 -07:00
Anatoliy Yastreb e7677bdf51 rubocop: revert has_precedence method rename 2016-06-02 21:25:50 +03:00
Anatoliy Yastreb 597e8ee5d5 rubocop: fix code style 2016-06-02 16:12:16 +03:00
Anatoliy Yastreb 06cff8f781 rubocop: fix code style 2016-06-01 18:20:35 +03:00
Derek Gottlieb db6050768d Feedback for flubbed regex and prefer File's directory check 2016-05-28 19:23:23 -05:00
Derek Gottlieb 03f7bc1a8c lib/jekyll/url.rb passing rubocop 2016-05-28 17:15:33 -05:00
Pat Hawks 714c99b418 Convert input to string before markdownify or smartify 2016-05-28 15:19:15 -05:00
Derek Gottlieb b5cec7d335 lib/jekyll/theme.rb passing rubocop 2016-05-28 13:51:13 -05:00
Florian Thomas f8c038566c `Serve.process` should receive same config as `Build.process` 
fixes #4850
 2016-05-27 11:46:04 +02:00
Parker Moore 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
Parker Moore 3a3405fe51
I will chain blocks if I want to chain blocks. 2016-05-26 16:09:56 -07:00
Parker Moore 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
jekyllbot 8a5148f589 Merge pull request #4948 from pathawks/drops 
Merge pull request 4948
 2016-05-26 16:03:52 -07:00
jekyllbot 8d0a4be5e0 Merge pull request #4931 from pathawks/converters 
Merge pull request 4931
 2016-05-26 10:28:21 -07:00
jekyllbot 40c6702a0d Merge pull request #4933 from pathawks/liquid 
Merge pull request 4933
 2016-05-26 10:21:38 -07:00
Pat Hawks 30eebaf5e0 Rubocop: lib/jekyll/drops/site_drop.rb 2016-05-26 12:04:28 -05:00
jekyllbot 87acab9a86 Merge pull request #4950 from pathawks/rubocop/entry_filter 
Merge pull request 4950
 2016-05-26 08:25:55 -07:00
Anatoliy Yastreb 001cbf2c07 rubocop: fix code style 2016-05-26 12:17:31 +03:00
Pat Hawks ae71db4693 Rubocop: lib/jekyll/stevenson.rb 2016-05-26 01:04:12 -05:00
Pat Hawks d855ec03ba Rubocop: lib/jekyll/converters/markdown/redcarpet_parser.rb 2016-05-26 00:53:38 -05:00
Pat Hawks 0880dc097f Rubocop: lib/jekyll/converters/markdown/kramdown_parser.rb 2016-05-26 00:53:26 -05:00
Pat Hawks 38eb326b7f Rubocop: lib/jekyll/converters/markdown.rb 2016-05-26 00:53:15 -05:00
Pat Hawks d58c986b2b Rubocop: lib/jekyll/entry_filter.rb 2016-05-26 00:45:54 -05:00
Pat Hawks 382be191ae Rubocop: lib/jekyll/readers/static_file_reader.rb 2016-05-26 00:10:43 -05:00
Pat Hawks 0696e6c169 Rubocop: lib/jekyll/readers/post_reader.rb 2016-05-26 00:10:31 -05:00
Pat Hawks 615a9ee9ac Rubocop: lib/jekyll/readers/page_reader.rb 2016-05-26 00:10:20 -05:00
Pat Hawks e85690a61f Rubocop: lib/jekyll/readers/layout_reader.rb 2016-05-26 00:10:09 -05:00
Pat Hawks 795bcdef68 Rubocop: lib/jekyll/reader.rb 2016-05-26 00:09:46 -05:00
Pat Hawks 4c35d15a3b Rubocop: lib/jekyll/liquid_renderer/table.rb 2016-05-26 00:07:52 -05:00
Pat Hawks 3e42e6d461 Rubocop: lib/jekyll/liquid_renderer.rb 2016-05-26 00:07:43 -05:00
Parker Moore 746e360c63
Delimeters, delimeters, delimeters. 2016-05-25 18:03:25 -07:00
Parker Moore 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
Parker Moore 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
Parker Moore 6f1e1d80cd
Rubocop: drop changes from v3.1 forward-ports 2016-05-25 16:10:11 -07:00
Parker Moore 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
jekyllbot dc5fd15f71 Merge pull request #4944 from pathawks/fp/sort-includes 
Merge pull request 4944
 2016-05-25 15:46:50 -07:00
jekyllbot 0ca45a48e5 Merge pull request #4943 from pathawks/fp/fix-layout-var-overflow 
Merge pull request 4943
 2016-05-25 15:44:23 -07:00
jekyllbot cf810a88fa Merge pull request #4942 from pathawks/fp/configuration-from-permalink-fix 
Merge pull request 4942
 2016-05-25 15:42:05 -07:00
Anatoliy Yastreb 2caf8e0621 rubocop: fix spacing in code style 2016-05-25 21:48:21 +03:00
Anatoliy Yastreb 5c036cf3c4 rubocop: fix code style 2016-05-25 20:24:19 +03:00
Parker Moore 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
Brint O'Hearn de39107c76 Rubocop cleanup for lib/jekyll/layout.rb 2016-05-25 11:28:46 -05:00
Brint O'Hearn 65e78b3280 Rubocop cleanup for lib/jekyll/plugin_manager.rb 2016-05-25 11:27:43 -05:00
Brint O'Hearn 3a04093e51 Rubocop cleanup for lib/jekyll/page.rb 2016-05-25 11:27:29 -05:00
Parker Moore 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
Anatoliy Yastreb 2ca80920dc rubocop: fix include tag code style 2016-05-25 13:15:04 +03:00
Parker Moore 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
Parker Moore ad7bd84098 lib/jekyll.rb: require document_drop to ease our pain 2016-05-24 19:03:32 -05:00
Parker Moore 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
Parker Moore db7cd6f612 Reset {{ layout }} between each render & merge layout data properly 2016-05-24 18:57:54 -05:00
Parker Moore 7641971d7e Fix tests for plugins in configuration. 2016-05-24 18:49:06 -05:00
Parker Moore 48274244e3 Define Drop#each so we can use the new frozen/duping behavior 2016-05-24 18:49:06 -05:00
Parker Moore d5c3785d29 Don't default 'include' and 'exclude' to an empty array 2016-05-24 18:49:06 -05:00
Parker Moore de5970ae55 Fix some minor things in the tests 2016-05-24 18:49:05 -05:00
Parker Moore d84844c223 Freeze configuration defaults & duplicate in deep_merge_hashes if need be. 2016-05-24 18:49:05 -05:00
Parker Moore 59346eb228 Remove call to #backwards_compatibilize in Configuration.from 2016-05-24 18:47:15 -05:00
Parker Moore 8af77643c5 Site#site_payload: sort collections by label 2016-05-24 18:47:15 -05:00
Parker Moore f52a0e7200 Configuration#add_default_collections: fix bug where DEFAULTS['collections'] is modified 2016-05-24 18:47:15 -05:00
Parker Moore d01f7943de Add Configuration.from & use in Jekyll.configuration. 
This process streamlines the creation of new configurations. Creating a new
site will choke if not all the correct options are given.
Configuration.from will ensure the overrides have all string keys and
ensures all the common issues & defaults are in place so a Site can be
created.

A common use:

    config = Configuration.from({ 'permalink' => '/:title/' }) # etc
    site = Jekyll::Site.new(config)
 2016-05-24 18:47:15 -05:00
Parker Moore fab092fcec Remove use of Marshal in runtime code. 2016-05-24 18:47:15 -05:00
Parker Moore 6eaa8e90f8 Don't read a config file if the filename is empty. 2016-05-24 18:47:14 -05:00
Parker Moore 04d4473119 Use Marshal to duplicate configuration defaults to prevent manipulation 2016-05-24 18:47:14 -05:00
Parker Moore f2263a11b7 Only write collections.posts.permalink if permalink is set. 2016-05-24 18:40:19 -05:00
Pat Hawks 48f16974ce Rubocop fixes 2016-05-24 18:27:37 -05:00
Parker Moore 7d3f8ac75d excerpt drop should give access to document's layout 2016-05-24 17:35:03 -05:00
Parker Moore c0910f2bc5 look up the content methods for drops in a smarter way 2016-05-24 17:34:49 -05:00
Parker Moore b019234007 Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid 2016-05-24 17:30:03 -05:00
Anatoliy Yastreb 80a65d161f rubocop: fix post URL tag code style 2016-05-24 17:23:25 +03:00
Anatoliy Yastreb 0d11511914 rubocop: fix link tag code style 2016-05-24 17:13:54 +03:00
Anatoliy Yastreb 41a8b10780 rubocop: fix highlight tag code style 2016-05-24 17:03:06 +03:00
Pat Hawks a8d27e5788 Rubocop: Low hanging fruit 2016-05-23 22:10:49 -05:00
Brint O'Hearn dbda462c2f Adding double quotes & freeze back to version after rebase 2016-05-20 21:51:16 -05:00
Brint O'Hearn d743c80357 Rubocop fixes for lib/jekyll/utils/ansi.rb 2016-05-20 21:24:34 -05:00
Parker Moore 51c4152919
Release a beta. 2016-05-20 19:19:21 -07:00
Parker Moore 8ac5b03006
Cleaning up site template & theme updates. 2016-05-20 19:15:46 -07:00
jekyllbot ee2c41ad6a Merge pull request #4848 from jekyll/new-theme-command 
Merge pull request 4848
 2016-05-19 22:13:05 -07:00
Parker Moore f3a29677f9
Fix rubocop issues. 2016-05-19 21:34:30 -07:00