Commit Graph

8182 Commits

Author SHA1 Message Date
jekyllbot
bc5e59ca3e Merge pull request #5505 from fene/master
Merge pull request 5505
2016-10-24 14:48:04 -07:00
jekyllbot
a87cfec587 Update history to reflect merge of #5511 [ci skip] 2016-10-23 18:52:47 -07:00
jekyllbot
26f775c210 Merge pull request #5511 from bksteiny/bksteiny-patch-1
Merge pull request 5511
2016-10-23 18:52:46 -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
fen
7729d12cdc include a hashbang for all benchmark scripts
this also makes every benchmark script executable
2016-10-22 03:13:30 +02:00
jekyllbot
12a86c1298 Update history to reflect merge of #5504 [ci skip] 2016-10-21 13:58:47 -07:00
jekyllbot
0ce9d726f5 Merge pull request #5504 from baiyangcao/patch-2
Merge pull request 5504
2016-10-21 13:58:47 -07:00
baiyangcao
d6844d284c Update deployment-methods.md 2016-10-21 13:30:26 +08:00
jekyllbot
4d597643ec Update history to reflect merge of #5502 [ci skip] 2016-10-20 13:12:08 -07:00
jekyllbot
343d5f7be5 Merge pull request #5502 from DirtyF/docs-jekyll-hook-outdated
Merge pull request 5502
2016-10-20 13:12:07 -07:00
Frank Taillandier
11a0b6578e Remove jekyll-hook from deployment methods 2016-10-20 21:12:16 +02:00
jekyllbot
3431c9f7b8 Update history to reflect merge of #5495 [ci skip] 2016-10-19 21:24:11 -07:00
jekyllbot
eca7f46749 Merge pull request #5495 from jekyll/pr/layouts-error
Merge pull request 5495
2016-10-19 21:24:11 -07:00
jekyllbot
821a845166 Update history to reflect merge of #5496 [ci skip] 2016-10-19 12:10:11 -07:00
jekyllbot
d979b4bf9b Merge pull request #5496 from jekyll/pr/rubocop
Merge pull request 5496
2016-10-19 12:10:11 -07:00
jekyllbot
124c63fd59 Update history to reflect merge of #5492 [ci skip] 2016-10-19 10:58:48 -07:00
jekyllbot
89bbb249af Merge pull request #5492 from tnhu/patch-2
Merge pull request 5492
2016-10-19 10:58:48 -07:00
jekyllbot
344d07cb55 Update history to reflect merge of #5497 [ci skip] 2016-10-19 10:40:43 -07:00
jekyllbot
0484986c16 Merge pull request #5497 from kingscott/master
Merge pull request 5497
2016-10-19 10:40:42 -07:00
Scott King
c7d0dda5a7 Add comment about gem outdated 2016-10-19 09:40:43 -04:00
Tan Nhu
ea72f98609 Fix typo 2016-10-19 00:53:44 -07:00
jekyllbot
0f5c34d16d Update history to reflect merge of #5494 [ci skip] 2016-10-18 18:38:14 -07:00
jekyllbot
0d8e21f779 Merge pull request #5494 from jekyll/pr/gsub
Merge pull request 5494
2016-10-18 18:38:13 -07:00
Scott King
2be5d56059 Fix some typos 2016-10-18 21:32:40 -04:00
Scott King
e6829b5949 Fix some typos 2016-10-18 21:15:50 -04:00
Scott King
8a4edc550b Add info about checking version + updating 2016-10-18 21:07:58 -04:00
Pat Hawks
cc1972848d Restrict Rubocop version 2016-10-18 19:51:54 -05:00
Pat Hawks
51d9be83a1 Do not swallow all exceptions on render 2016-10-18 19:45:03 -05:00
Pat Hawks
c4a23b4ced Collapse gsub 2016-10-18 18:53:54 -05:00
Tan Nhu
b9275920dd Update jekyll-include-absolute-plugin description 2016-10-18 09:52:57 -07:00
jekyllbot
53d20bc77e Update history to reflect merge of #5479 [ci skip] 2016-10-18 09:51:45 -07:00
jekyllbot
7aa9c3f12c Merge pull request #5479 from ashmaroli/test-script
Merge pull request 5479
2016-10-18 09:51:45 -07:00
Tan Nhu
00e3c979c9 Add jekyll-include-absolute-plugin 2016-10-18 09:51:16 -07:00
jekyllbot
0a1c837755 Update history to reflect merge of #5489 [ci skip] 2016-10-18 09:50:50 -07:00
jekyllbot
7c901baac1 Merge pull request #5489 from ashmaroli/rubocop-fix
Merge pull request 5489
2016-10-18 09:50:49 -07:00
jekyllbot
1f9c2b1380 Update history to reflect merge of #5491 [ci skip] 2016-10-18 09:49:12 -07:00
jekyllbot
146d5930a4 Merge pull request #5491 from ashmaroli/patch-1
Merge pull request 5491
2016-10-18 09:49:12 -07:00
ashmaroli
6ec86f4207 Add jekyll-data to the list of plugins 2016-10-18 16:20:41 +05:30
Ashwin Maroli
d1f67bf85a fix rubocop errors on testing with Rubocop 0.44
- have the new `Metrics/BlockLength` cop ignore test files and
    `jekyll/configuration.rb`
  - have `AllCops` ignore Jekyll Executable which is not going to be
    altered in the near future.
2016-10-17 13:24:54 +05:30
jekyllbot
c9d24b7d18 Update history to reflect merge of #5472 [ci skip] 2016-10-12 17:53:51 -07:00
jekyllbot
62ec32c883 Merge pull request #5472 from codethebeard/patch-1
Merge pull request 5472
2016-10-12 17:53:51 -07:00
jekyllbot
aa97be3ab5 Update history to reflect merge of #5471 [ci skip] 2016-10-12 15:34:51 -07:00
jekyllbot
389bbe1621 Merge pull request #5471 from chrisfinazzo/normalize-css-v5
Merge pull request 5471
2016-10-12 15:34:50 -07:00
Ashwin Maroli
0d12a02893 script/test: add missing whitespace 2016-10-12 14:35:39 +05:30
jekyllbot
d4b7b44328 Update history to reflect merge of #5475 [ci skip] 2016-10-11 08:46:53 -07:00
Michael Large
6cec4aebc6 Additional typo related to pull request #5472 2016-10-11 09:05:39 -04:00
Michael Large
f2fcd17627 Fix typo in theme_template README 2016-10-10 11:10:41 -04:00
chrisfinazzo
c569edcf0a Update normalize.css to v5.0.0 2016-10-09 11:36:04 -04:00
jekyllbot
53d472b7e2 Update history to reflect merge of #5449 [ci skip] 2016-10-06 11:45:20 -07:00
jekyllbot
f93e40209c Merge pull request #5449 from DirtyF/docs-link-tag
Merge pull request 5449
2016-10-06 11:45:19 -07:00