Merge branch 'rails-5.1'
This commit is contained in:
@@ -58,7 +58,7 @@ class PostPresenter < Presenter
|
||||
|
||||
if options[:size]
|
||||
html << %{<p class="desc">}
|
||||
html << post.file_size.to_formatted_s(:human_size)
|
||||
html << post.file_size.to_s(:human_size)
|
||||
html << " (#{post.image_width}x#{post.image_height})"
|
||||
html << %{</p>}
|
||||
end
|
||||
|
||||
@@ -22,8 +22,6 @@ module PostSetPresenters
|
||||
related_tags_for_single(post_set.unordered_tag_array.first)
|
||||
elsif post_set.tag_string =~ /(?:^|\s)(?:#{Tag::SUBQUERY_METATAGS}):\S+/
|
||||
calculate_related_tags_from_post_set
|
||||
elsif post_set.tag_string =~ /search:/
|
||||
saved_search_tags
|
||||
elsif post_set.is_empty_tag?
|
||||
popular_tags
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user