Commit Graph

2690 Commits

Author SHA1 Message Date
Ashwin Maroli 90d7472388 Remove dependency on include from default about.md
This ensures better portability, allowing to switch and preview
themes without having to delete the code block.
2017-02-25 08:37:30 +05:30
Parker Moore 5bc67c1fb7
Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty 2017-02-10 21:56:43 -05:00
jekyllbot afe6e3622c Merge pull request #5860 from ashmaroli/exclude-patch
Merge pull request 5860
2017-02-10 21:10:09 -05:00
Ben Balter 229769e249
add StaticFileDrop 2017-02-08 17:44:47 -05:00
Ashwin Maroli 3745b24564 update comment for `exclude` array 2017-02-05 07:55:26 +05:30
Ashwin Maroli 6316856773 comment out 'exclude:' in config file 2017-02-05 01:28:43 +05:30
Ashwin Maroli 4e40593a53 exclude Gemfile and its lockfile by default 2017-02-05 01:26:41 +05:30
jekyllbot 2cf685feb2 Merge pull request #4362 from jekyll/liquid-4
Merge pull request 4362
2017-01-27 11:10:53 -05:00
Parker Moore d266354e42
Merge branch 'master' into release-3-4-0
* master: (39 commits)
  Update history to reflect merge of #5798 [ci skip]
  Update history to reflect merge of #5822 [ci skip]
  use logger.info
  run codeclimate after success
  Update history to reflect merge of #5819 [ci skip]
  Fixed inaccuracy in "Built-in permalink styles" docs [skip ci]
  Update history to reflect merge of #5802 [ci skip]
  Update history to reflect merge of #5811 [ci skip]
  Update history to reflect merge of #5690 [ci skip]
  Update history to reflect merge of #5815 [ci skip]
  Review CI pages
  Rework CI doc to include multiple providers.
  Update history to reflect merge of #5812 [ci skip]
  Add jekyll-ga plug-in
  Update configuration.md
  Add mention of classifier-reborn for LSI
  Update history to reflect merge of #5810 [ci skip]
  Got that diaper money?
  Added note about --blank flag
  Update history to reflect merge of #5797 [ci skip]
  ...
2017-01-26 16:15:07 -05:00
Joel Meyer-Hamme 4b19e93f09 use logger.info
Imo running `--lsi` should use `Jekyll.logger.info`, so it can be made `--quiet`.
2017-01-26 16:02:08 +00:00
Parker Moore b7f44e6eca
Queue up a 3.4 deploy with unfinished release post. 2017-01-18 16:54:36 -05:00
jekyllbot 477b2f0f3e Merge pull request #5640 from jekyll/jekyll-utils-exec
Merge pull request 5640
2017-01-18 14:15:11 -05:00
Parker Moore 023476049b
Remove superfluous self. 2017-01-17 16:21:28 -05:00
Parker Moore 9a5307c3f9
Don't include the theme's includes_path if it is nil. 2017-01-16 19:17:45 -05:00
Florian Thomas ecd04badf0 throw IncludeTagError if error occurs in included file
fixes #5756
2017-01-15 20:35:10 +01:00
jekyllbot aa63deb2a9 Merge pull request #5750 from jekyll/no-implicit-conversion-of-nil-to-string
Merge pull request 5750
2017-01-14 00:01:31 -05:00
Pat Hawks 1d885911bc
Rubocop: Require consistent comma in multiline literals 2017-01-12 17:52:29 -06:00
Parker Moore 02858fdf08 include: improve boolean logic in #valid_include_file? 2017-01-11 12:05:56 -05:00
jekyllbot bf33dc7f50 Merge pull request #5621 from rogerogden/patch-1
Merge pull request 5621
2017-01-10 12:05:58 -08:00
Frank Taillandier 31178bfe69 Merge branch 'master' into liquid-4 2017-01-10 20:01:04 +01:00
Parker Moore faa67bcd62
include: fix 'no implicit conversion of nil to String'
This is when either 'dir' or 'file' is nil.
2017-01-10 12:12:55 -05:00
Pat Hawks 0f2013114c
Merge branch 'master' into jekyll-utils-exec 2017-01-06 05:42:15 -06:00
Pat Hawks 1e4b779ab3
Escape # 2017-01-05 18:34:44 -06:00
Pat Hawks 5652c10305
Try to replace `URI.escape` with Addressable 2017-01-05 18:01:00 -06:00
Pat Hawks 6fb05e0799
Use Addressable instead of URI to decode 2017-01-05 17:44:54 -06:00
Chayoung You de6d62b2e3
Use the current year for the LICENSE of theme 2017-01-02 22:29:25 +09:00
Pat Hawks 72a56d9eb7
Check for `to_time` 2016-12-22 19:18:43 -06:00
Pat Hawks f7edcceb70
Check return value of `to_date` 2016-12-22 16:15:09 -06:00
Pat Hawks 2eb8469936
Never throw on `sample` 2016-12-22 15:48:03 -06:00
Pat Hawks 607ab66707 Use Liquid's own `to_integer` 2016-12-22 15:32:55 -06:00
Pat Hawks c42eb7fc3a Take advantage of Liquid::Utils.to_date 2016-12-22 15:32:45 -06:00
Kevin Wojniak 2fc800ebd2 Use each instead of map to actually return nothing 2016-12-18 17:32:19 -08:00
Frank Taillandier 48f7a155c3 reindent attributes 2016-12-18 08:55:05 +01:00
Frank Taillandier d134afcd4a ran rubocop -a 2016-12-18 07:22:36 +01:00
Frank Taillandier de56b977b6 ran rubocop -a
#5665
2016-12-18 07:22:11 +01:00
Parker Moore 7862f731b6
grouping filters: use Liquid::ParseContext to create variable. 2016-12-16 15:38:19 -08:00
Florian Thomas dde0441b3a
find keys also in assigned collections 2016-12-16 15:37:10 -08:00
Florian Thomas dbea1ca80b
parse expressions before passing it to Liquid::Condition 2016-12-16 15:37:04 -08:00
jekyllbot 8ed324007a Merge pull request #5513 from thiagoarrais/5415-group_by_exp-filter
Merge pull request 5513
2016-12-09 16:01:21 -08:00
jekyllbot 1049802499 Merge pull request #5612 from ashmaroli/win-tz
Merge pull request 5612
2016-12-08 20:09:01 -08:00
Parker Moore 3c139a09f1
Care about things. 2016-12-07 18:00:47 -08:00
Parker Moore 18c2b0827e
Appease rubocop. 2016-12-07 17:53:45 -08:00
Parker Moore 6e2449b482
Write Jekyll::Utils::Exec.run for running shell commands. 2016-12-07 17:38:22 -08:00
Dean Attali f3300c1772 use backticks for Gemfile for consistency since in the next sentence _config.yml file has backtick 2016-12-07 19:45:19 -05:00
Ashwin Maroli f8456e02c1 narrow it down to only Windows 2016-12-06 15:38:18 +05:30
Ashwin Maroli 31eeb1a561 add 'tzinfo-data' gem to generated Gemfile 2016-12-06 15:38:18 +05:30
Ashwin Maroli c4142c4c77 add a utility submodule to define 'TZ' on Windows 2016-12-06 15:38:18 +05:30
Alexey Rogachev 8d4950d6e4 Fixed typo 2016-12-05 13:31:47 +06:00
Roger Ogden 7b73abcdd9 Deleted trailing whitespace on line 22 2016-12-02 17:18:30 -07:00
Roger Ogden ed9520cd3b Fixes #5498
Updated data_reader.rb comments to more accurately reflect read() and read_data_to() functionality.
2016-12-02 16:58:31 -07:00