Commit Graph

2665 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Thiago Arrais
91f0b91d6a Rename for more idiomatic Ruby 2016-11-30 18:16:25 -03:00
jekyllbot
805dd4b0f1 Merge pull request #5611 from XhmikosR/https
Merge pull request 5611
2016-11-29 15:50:29 -08:00
XhmikosR
d9cf97e9c6 Switch to https when possible.
Also, remove two 404 links.
2016-11-29 23:39:23 +02:00
jona
fac041933c fix date parsing in file names 2016-11-29 09:14:03 +01:00
Eldritch Cheese
a55760d4ad Added unit test for special character, fixed error that it exposed. 2016-11-26 22:31:03 -05:00
Eldritch Cheese
bbdeb32f38 Escaped regular expressions when using post_url.
Previously, the post_url function would give error messages when the
post being listed contained special characters for use in regular
expressions.  These special characters are now escaped using
Regexp.escape.
2016-11-26 16:51:01 -05:00
Tim Banks
5c965d6a20 Add connector param to array_to_sentence_string filter 2016-11-22 17:38:33 -06:00
Parker Moore
7c44c5a56d Release 💎 3.3.1 2016-11-14 14:36:05 -08:00
Parker Moore
d3e387d146 Fix typo. 2016-11-14 13:30:14 -08:00
Parker Moore
ff012e795a Fix fmt error. 2016-11-11 16:30:53 -08:00
Parker Moore
d50ef0e3dd Add useful comment. 2016-11-11 16:30:53 -08:00
Parker Moore
347651e571 URL#generate_url_from_drop: be smarter about replacing *just* the keys 2016-11-11 16:30:53 -08:00
jekyllbot
f8ec71af3b Merge pull request #5464 from jekyll/allow-regular-windows-watchers
Merge pull request 5464
2016-11-10 15:05:41 -08:00
Parker Moore
df45f26187 Builder.watch: only warn for Bash on Windows, still try watching. 2016-11-10 12:55:00 -08:00
Jordon Bedwell
d71dff74ae Fix #5462: Only shutdown watch in Bash On Windows. 2016-11-10 12:55:00 -08:00
Parker Moore
7bf4627046 Add vendor/gems to the list of excluded & do some refactoring. 2016-11-09 09:42:26 -08:00
Parker Moore
b194211a32 Be much more specific about ignoring vendored directories. 2016-11-09 09:42:26 -08:00
jekyllbot
f10c914fd5 Merge pull request #5524 from fene/nomethoderror
Merge pull request 5524
2016-11-08 17:05:18 -08:00
Thiago Arrais
7ac9653f4e RDoc for group_by_exp 2016-11-04 18:32:52 -03:00
Thiago Arrais
7f18ac8f99 Group using arbitraty Liquid expressions 2016-11-04 18:16:46 -03:00
fen
e92dd2055d check for the urldrop key first 2016-11-02 21:30:23 +01:00
fen
2d35364c02 implement warning about missing keys in url drops 2016-11-02 00:22:41 +01:00
jekyllbot
4896f54b87 Merge pull request #5457 from ashmaroli/dependency-template
Merge pull request 5457
2016-10-24 14:49:19 -07:00
Chris Stein
9bb242b44a fix _config.yml typo in site_template
Found a typo when going through a tutorial. Replacing `these this` with `this`
2016-10-23 15:26:50 -05:00
jekyllbot
eca7f46749 Merge pull request #5495 from jekyll/pr/layouts-error
Merge pull request 5495
2016-10-19 21:24:11 -07:00