From 9aea71137e1183ed768f156afebd0055f5620ad0 Mon Sep 17 00:00:00 2001 From: Kyle O'Brien Date: Sun, 18 Sep 2016 09:51:33 -0400 Subject: [PATCH 1/6] Add missing period to sentence in first paragraph. Added a period to the end of the last sentence in the first paragraph, which was missing. --- site/_docs/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/installation.md b/site/_docs/installation.md index b86d179e..712e3bae 100644 --- a/site/_docs/installation.md +++ b/site/_docs/installation.md @@ -7,7 +7,7 @@ permalink: /docs/installation/ Getting Jekyll installed and ready-to-go should only take a few minutes. If it ever becomes a pain, please [file an issue]({{ site.repository }}/issues/new) (or submit a pull request) describing the issue you -encountered and how we might make the process easier +encountered and how we might make the process easier. ### Requirements From 7a9427ccec81eb210bb818fc66523c7d57ddb890 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 18 Sep 2016 10:54:26 -0700 Subject: [PATCH 2/6] Update history to reflect merge of #5372 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index db214a70..b85989b1 100644 --- a/History.markdown +++ b/History.markdown @@ -47,6 +47,7 @@ * Explain how to copy a theme's files (#5335) * [docs] .md as default extension in examples (#5316) * Fix small typo in docs (#5347) + * Add missing period to sentence in first paragraph. (#5372) ### Development Fixes From 3bfdc00d14af0202295172169985f5de3ab71571 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 19 Sep 2016 13:15:02 -0500 Subject: [PATCH 3/6] Appease Rubocop --- exe/jekyll | 2 +- lib/jekyll/hooks.rb | 2 +- test/test_related_posts.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/exe/jekyll b/exe/jekyll index c233dd1a..3bd37e54 100755 --- a/exe/jekyll +++ b/exe/jekyll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby STDOUT.sync = true -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w(.. lib))) +$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib")) require "jekyll" require "mercenary" diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb index c9a4f794..44ce0c12 100644 --- a/lib/jekyll/hooks.rb +++ b/lib/jekyll/hooks.rb @@ -54,7 +54,7 @@ module Jekyll # Ensure the priority is a Fixnum def self.priority_value(priority) - return priority if priority.is_a?(Fixnum) + return priority if priority.is_a?(Integer) PRIORITY_MAP[priority] || DEFAULT_PRIORITY end diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb index cea3ad0b..ef7265ef 100644 --- a/test/test_related_posts.rb +++ b/test/test_related_posts.rb @@ -13,8 +13,8 @@ class TestRelatedPosts < JekyllUnitTest last_post = @site.posts.last related_posts = Jekyll::RelatedPosts.new(last_post).build - last_10_recent_posts = (@site.posts.docs.reverse - [last_post]).first(10) - assert_equal last_10_recent_posts, related_posts + last_ten_recent_posts = (@site.posts.docs.reverse - [last_post]).first(10) + assert_equal last_ten_recent_posts, related_posts end end From 75d59911ae6d9dd559fa71b17a2539380406d795 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Mon, 19 Sep 2016 17:08:00 +0530 Subject: [PATCH 4/6] run features on windows --- features/support/helpers.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/support/helpers.rb b/features/support/helpers.rb index 79210ad7..0d809bca 100644 --- a/features/support/helpers.rb +++ b/features/support/helpers.rb @@ -90,7 +90,7 @@ end def run_jekyll(args) args = args.strip.split(" ") # Shellwords? - process = run_in_shell(Paths.jekyll_bin.to_s, *args, "--trace") + process = run_in_shell("ruby", Paths.jekyll_bin.to_s, *args, "--trace") process.exitstatus.zero? end From 92dbe313e997af6287c78433a8e6188dbee9dfda Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 20 Sep 2016 09:26:40 -0700 Subject: [PATCH 5/6] Update history to reflect merge of #5383 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b85989b1..f340cd69 100644 --- a/History.markdown +++ b/History.markdown @@ -61,6 +61,7 @@ * Execute jekyll from clone instead of defined binary when running 'script/default-site' (#5295) * rubocop: lib/jekyll/document.rb complexity fixes (#5045) * Proxy a number of Convertible methods to Renderer (#5308) + * Run executable for Cucumber via Ruby instead of Shell (#5383) ## 3.2.1 / 2016-08-02 From 950a37395fad8ef7de830ca1260afc0d27141e23 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 20 Sep 2016 13:10:49 -0700 Subject: [PATCH 6/6] Update history to reflect merge of #5381 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index f340cd69..b9309d54 100644 --- a/History.markdown +++ b/History.markdown @@ -62,6 +62,7 @@ * rubocop: lib/jekyll/document.rb complexity fixes (#5045) * Proxy a number of Convertible methods to Renderer (#5308) * Run executable for Cucumber via Ruby instead of Shell (#5383) + * Appease Rubocop (#5381) ## 3.2.1 / 2016-08-02