Skip to content

Commit

Permalink
Merge pull request jekyll#5381 from pathawks/pr/rubocop
Browse files Browse the repository at this point in the history
Merge pull request 5381
  • Loading branch information
jekyllbot authored Sep 20, 2016
2 parents 92dbe31 + 3bfdc00 commit d8d42f6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion exe/jekyll
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/jekyll/hooks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def self.register(owners, event, priority: DEFAULT_PRIORITY, &block)

# 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

Expand Down
4 changes: 2 additions & 2 deletions test/test_related_posts.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit d8d42f6

Please sign in to comment.