Update to Rails 5.1

This also fixes a bug in the fresh_when handling for the changelog
view, which was exposed by the update (due to ETag now taking the
flash message, if any, into account).

Signed-off-by: Hans de Graaff <graaff@gentoo.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb
index de24b40..64cb289 100644
--- a/app/controllers/packages_controller.rb
+++ b/app/controllers/packages_controller.rb
@@ -37,15 +37,15 @@ class PackagesController < ApplicationController
     @package = Package.find_by(:atom, params[:id])
     fail ActionController::RoutingError, 'No such package' unless @package
 
-    fresh_when etag: @package.updated_at, last_modified: @package.updated_at, public: true
-
-    @changelog = Rails.cache.fetch("changelog/#{@package.atom}") do
-      Portage::Util::History.for(@package.category, @package.name, 5)
-    end
+    if stale?(etag: @package.updated_at, last_modified: @package.updated_at, public: true)
+      @changelog = Rails.cache.fetch("changelog/#{@package.atom}") do
+        Portage::Util::History.for(@package.category, @package.name, 5)
+      end
 
-    respond_to do |wants|
-      wants.html { render layout: false }
-      wants.json {}
+      respond_to do |wants|
+        wants.html { render layout: false }
+        wants.json {}
+      end
     end
   end