Merge branch 'rails-5.1'

2018-04-11 11:40:36 -07:00
parent a25629bff9 abce4d2551
commit d9d98f05c2
361 changed files with 4795 additions and 4798 deletions
--- a/app/presenters/post_presenter.rb
+++ b/app/presenters/post_presenter.rb
@@ -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