Commit Graph

8333 Commits

Author SHA1 Message Date
Parker Moore f27eb77d0b
Add failing test for permalink templates with trailing underscores 2016-11-11 16:30:53 -08:00
jekyllbot 51d04cbd00 Update history to reflect merge of #5571 [ci skip] 2016-11-10 15:22:13 -08:00
jekyllbot 2713716d55 Merge pull request #5571 from DirtyF/docs-github-pages
Merge pull request 5571
2016-11-10 15:22:13 -08:00
jekyllbot 07d4333579 Update history to reflect merge of #5464 [ci skip] 2016-11-10 15:05:42 -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
jekyllbot dbfe0cdf56 Update history to reflect merge of #5570 [ci skip] 2016-11-10 14:50:39 -08:00
jekyllbot 1e0697a258 Merge pull request #5570 from DirtyF/fix-pinboard-plugin-link
Merge pull request 5570
2016-11-10 14:50:39 -08:00
Frank Taillandier 3e504f0837 mention `docs` folder to deploy on GitHub Pages
fix #5543
2016-11-10 23:42:01 +01:00
jekyllbot 262ebbb9f0 Update history to reflect merge of #5559 [ci skip] 2016-11-10 14:32:55 -08:00
jekyllbot 810f0e93d0 Merge pull request #5559 from ryandesign/use-baseurl-before-link-tag
Merge pull request 5559
2016-11-10 14:32:54 -08:00
Frank Taillandier e515ddeb29 fix link to jekyll-pinboard plugin 2016-11-10 23:13:34 +01:00
Parker Moore d050f6de10
Update history to reflect merge of #5493 [ci skip] 2016-11-10 13:18:17 -08:00
Parker Moore b7cbfc0fb7
Merge branch 'mattg-master'
* mattg-master:
  Add two plugins to the plugins page
2016-11-10 13:16:27 -08:00
Parker Moore 09ec7c81f2
Update history to reflect merge of #5507 2016-11-10 13:15:57 -08:00
Parker Moore 09548c3d96
Merge branch 'spencerbyw-patch-3'
* spencerbyw-patch-3:
  Update 2-to-3.md
2016-11-10 13:15:31 -08:00
Parker Moore fcbbc4d0bc
Update history to reflect merge of #5514 2016-11-10 13:15:20 -08:00
Parker Moore 6744921f69
Merge branch 'georgemandis-patch-1'
* georgemandis-patch-1:
  Added jekyll-pinboard.
2016-11-10 13:14:14 -08:00
Parker Moore 6110002d1e
Fix history reference to #5532. 2016-11-10 13:13:11 -08:00
Parker Moore bafe37cc9d
Update history to reflect merge of #5520 2016-11-10 13:12:29 -08:00
Parker Moore cc3197856b
Merge branch 'clorichel-patch-1'
* clorichel-patch-1:
  no more invalid US-ASCII on lines 30 and 97
2016-11-10 13:11:29 -08:00
jekyllbot fc66991243 Update history to reflect merge of #5526 [ci skip] 2016-11-10 13:02:49 -08:00
jekyllbot 3e1fad273b Merge pull request #5526 from ashmaroli/fix-win-tests
Merge pull request 5526
2016-11-10 13:02:48 -08:00
jekyllbot 4268301071 Update history to reflect merge of #5546 [ci skip] 2016-11-10 13:02:10 -08:00
jekyllbot 1254ffc593 Merge pull request #5546 from ashmaroli/win-cucumber
Merge pull request 5546
2016-11-10 13:02:09 -08:00
jekyllbot 2d1a50c212 Update history to reflect merge of #5564 [ci skip] 2016-11-10 13:00:40 -08:00
jekyllbot c7b301709c Merge pull request #5564 from jekyll/vendor-bundle
Merge pull request 5564
2016-11-10 13:00:39 -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
Parker Moore 74a5297c19
Lock to codeclimate-test-reporter ~> 0.6.0. /cc #5565 2016-11-09 09:42:01 -08:00
jekyllbot 0de653d186 Update history to reflect merge of #5524 [ci skip] 2016-11-08 17:05:19 -08:00
jekyllbot f10c914fd5 Merge pull request #5524 from fene/nomethoderror
Merge pull request 5524
2016-11-08 17:05:18 -08:00
jekyllbot ca3aaec7b5 Update history to reflect merge of #5557 [ci skip] 2016-11-08 12:35:43 -08:00
jekyllbot 3d1a7efe26 Merge pull request #5557 from 10by10pixel/patch-1
Merge pull request 5557
2016-11-08 12:35:42 -08:00
Ryan Schmidt 92354fa7fc Use site.baseurl before post_url tag 2016-11-07 23:29:49 -06:00
Ryan Schmidt 70fae19b88 Use site.baseurl before link tag 2016-11-07 23:27:33 -06:00
Owen Walters 3035806826 R.I.P. Startups 2016-11-07 11:29:03 -05:00
Ashwin Maroli 1bafbd91fa create orphan files with touch method 2016-11-05 16:03:30 +05:30
Ashwin Maroli 7314e4a5db collections.feature: conditional steps 2016-11-04 12:29:48 +05:30
Ashwin Maroli 2c68069a41 TestSite: consider dive-letter in Windows
The array of plugins will contain current drive-letter in Windows
2016-11-04 09:20:46 +05:30
Ashwin Maroli 1852e54d10 add and use 'skip_if_windows' helper method
- add a new helper method to skip tests if on Windows platform
  - skip those tests that fail due to lack of support for symlinked files
    on Windows.
2016-11-04 09:20:46 +05:30
Parker Moore 57a6847165
Fix some external links. 2016-11-03 16:29:50 -07:00
Parker Moore 7af41649e9
Fix internal links. 2016-11-03 16:26:21 -07:00
Parker Moore 9824c3103b
Allow us to specify other options to pass to htmlproofer. 2016-11-03 16:26:16 -07:00
Parker Moore 8157d53af0
Update contributing documentation based on .github/CONTRIBUTING.md 2016-11-03 15:53:00 -07:00
jekyllbot e1eff52cd2 Update history to reflect merge of #5536 [ci skip] 2016-11-03 15:22:56 -07:00
jekyllbot 4399dbbd3d Merge pull request #5536 from malaterre/patch-1
Merge pull request 5536
2016-11-03 15:22:55 -07:00
Parker Moore 2dafd50664
Remove freenode.txt from jekyllrb.com.
Fixes #5539.
2016-11-03 13:32:20 -07:00
jekyllbot b30c499196 Update history to reflect merge of #5540 [ci skip] 2016-11-03 09:53:43 -07:00