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

8583 Commits

Author SHA1 Message Date
jekyllbot 402eb0dfa5 Update history to reflect merge of #5542 [ci skip] 2017-01-17 20:21:49 -05:00
jekyllbot 76e9b8d266 Merge pull request #5542 from ashmaroli/url-slash 
Merge pull request 5542
 2017-01-17 20:21:48 -05:00
jekyllbot 0b4a097a40 Update history to reflect merge of #5753 [ci skip] 2017-01-17 20:20:36 -05:00
jekyllbot 20c6aec88f Merge pull request #5753 from DirtyF/docs-merge-categories 
Merge pull request 5753
 2017-01-17 20:20:35 -05:00
jekyllbot a9c7e14d60 Update history to reflect merge of #5780 [ci skip] 2017-01-17 18:59:39 -05:00
jekyllbot b5d1be4dcf Merge pull request #5780 from jekyll/dont-include-in-load-path-if-nil 
Merge pull request 5780
 2017-01-17 18:59:38 -05:00
Parker Moore 130159dda4
Fix rubocop error. 2017-01-17 17:05:14 -05:00
Parker Moore 023476049b
Remove superfluous self. 2017-01-17 16:21:28 -05:00
Parker Moore e0d63c8aa9
Add test to ensure that if the includes dir isn't in the theme that it won't break the site 2017-01-17 16:19:47 -05:00
Parker Moore ad8fb9b927
Add theme_dir() helper func 2017-01-17 16:19:26 -05:00
jekyllbot 2052280ccd Update history to reflect merge of #5791 [ci skip] 2017-01-17 14:56:00 -05:00
jekyllbot aa9cb1524c Merge pull request #5791 from DirtyF/fix-note 
Merge pull request 5791
 2017-01-17 14:55:59 -05:00
Frank Taillandier e1f4d92d02
add missing class 2017-01-17 18:22:28 +01:00
jekyllbot 39c4054cd1 Update history to reflect merge of #5784 [ci skip] 2017-01-17 04:34:19 -05:00
jekyllbot 3a9cb90a08 Merge pull request #5784 from ashmaroli/bump-rvm 
Merge pull request 5784
 2017-01-17 04:34:18 -05:00
Ashwin Maroli bfb6cf1ca9 bump rubies 2017-01-17 14:35:33 +05:30
jekyllbot b9dedb3477 Update history to reflect merge of #5312 [ci skip] 2017-01-17 03:34:05 -05:00
jekyllbot 321364e3cc Merge pull request #5312 from DirtyF/docs-usage-help 
Merge pull request 5312
 2017-01-17 03:34:04 -05:00
Frank Taillandier 492a510538 Merge branch 'master' into docs-usage-help 2017-01-17 09:32:48 +01:00
jekyllbot 9c72903395 Update history to reflect merge of #5781 [ci skip] 2017-01-17 03:24:08 -05:00
jekyllbot 8d4cce9335 Merge pull request #5781 from DirtyF/bump-htmlproofer 
Merge pull request 5781
 2017-01-17 03:24:06 -05:00
jekyllbot 4ea770e995 Update history to reflect merge of #5782 [ci skip] 2017-01-17 03:22:44 -05:00
jekyllbot 5d5b24d3d1 Merge pull request #5782 from DirtyF/bump-jemoji 
Merge pull request 5782
 2017-01-17 03:22:43 -05:00
jekyllbot 5460e71176 Update history to reflect merge of #5731 [ci skip] 2017-01-16 21:48:20 -05:00
jekyllbot bf7e24cc99 Merge pull request #5731 from zdroid/gcc-make 
Merge pull request 5731
 2017-01-16 21:48:19 -05:00
jekyllbot 67ab159606 Update history to reflect merge of #5691 [ci skip] 2017-01-16 21:38:56 -05:00
jekyllbot 16d71b1f4b Merge pull request #5691 from tomjohnson1492/patch-5 
Merge pull request 5691
 2017-01-16 21:38:55 -05:00
Frank Taillandier c39414a17b
use latest jemoji gem 2017-01-17 02:59:57 +01:00
Frank Taillandier cd8836cf6e bump htmlproofer 2017-01-17 02:34:15 +01:00
Parker Moore 9a5307c3f9
Don't include the theme's includes_path if it is nil. 2017-01-16 19:17:45 -05:00
jekyllbot e509cf2139 Update history to reflect merge of #5767 [ci skip] 2017-01-16 18:38:35 -05:00
jekyllbot 6c4699bd54 Merge pull request #5767 from Crunch09/issue-5756 
Merge pull request 5767
 2017-01-16 18:38:34 -05:00
jekyllbot 448b6ba08e Update history to reflect merge of #5779 [ci skip] 2017-01-16 17:03:42 -05:00
jekyllbot 71dab94a97 Merge pull request #5779 from jekyll/fix-flaky-plugins-path-test 
Merge pull request 5779
 2017-01-16 17:03:41 -05:00
Parker Moore aa7e47a30d
Remove calls to Dir.chdir without a block. 
This removes the necessity to initialize Jekyll::Configuration::DEFAULTS manually.
 2017-01-16 16:43:25 -05:00
Parker Moore 567a7952dd
test/helper: fix flaky plugin path test by initializing Configuration::DEFAULTS at start of tests 
If we do a Dir.chdir before Configuration::DEFAULTS is initialized, then its source and destination values will not be what we expect.
We expect that Dir.pwd should stay as the root of the repo but there are some errant calls to Dir.chdir without a block that are still
not yet cleaned up.
 2017-01-16 16:25:09 -05:00
jekyllbot 9d70bbba44 Update history to reflect merge of #5768 [ci skip] 2017-01-16 16:00:07 -05:00
jekyllbot 750fb32ca3 Merge pull request #5768 from DirtyF/rubocop-47 
Merge pull request 5768
 2017-01-16 16:00:06 -05:00
jekyllbot 036dd3ccc9 Update history to reflect merge of #5769 [ci skip] 2017-01-16 11:05:25 -05:00
jekyllbot 941e8f85dd Merge pull request #5769 from diev/patch-1 
Merge pull request 5769
 2017-01-16 11:05:24 -05:00
Dmitrii Evdokimov 55993c6c5d Fix a markdown link to look properly on the web 2017-01-16 17:53:04 +03:00
Frank Taillandier d790477d6d Add security rules 2017-01-16 10:43:07 +01:00
Frank Taillandier a30d81ceb8 bump Rubocop to v47 2017-01-16 10:26:08 +01:00
Florian Thomas ecd04badf0 throw IncludeTagError if error occurs in included file 
fixes #5756
 2017-01-15 20:35:10 +01:00
jekyllbot becdcb5164 Update history to reflect merge of #5765 [ci skip] 2017-01-15 03:47:06 -05:00
jekyllbot 057365a578 Merge pull request #5765 from jekyll/bump-rubocop 
Merge pull request 5765
 2017-01-15 03:47:05 -05:00
Frank Taillandier 6f8bf2e950 appease rubocop 2017-01-14 20:11:30 +01:00
Frank Taillandier 39b7af3732 exclude rake tasks and gemspec from metrics 
exclude from BlockLength and LineLength metrics
 2017-01-14 20:05:11 +01:00
Frank Taillandier 5d52074d2d appease Rubocop 2017-01-14 20:01:41 +01:00
Frank Taillandier 44324828b4 bump Rubocop to latest version 2017-01-14 20:00:36 +01:00