From 10ba09f5466fe3d34a5ed78202c35f4e4f9d30e6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 17 Aug 2016 17:56:23 +0200
Subject: Upgrade to Rails 5.0.0.1

---
 app/controllers/xrd_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/controllers/xrd_controller.rb')

diff --git a/app/controllers/xrd_controller.rb b/app/controllers/xrd_controller.rb
index fa67b2baa..1e39a3e4c 100644
--- a/app/controllers/xrd_controller.rb
+++ b/app/controllers/xrd_controller.rb
@@ -1,5 +1,5 @@
 class XrdController < ApplicationController
-  before_filter :set_format
+  before_action :set_format
 
   def host_meta
     @webfinger_template = "#{webfinger_url}?resource={uri}"
@@ -10,7 +10,7 @@ class XrdController < ApplicationController
     @canonical_account_uri = "acct:#{@account.username}@#{Rails.configuration.x.local_domain}"
     @magic_key = pem_to_magic_key(@account.keypair.public_key)
   rescue ActiveRecord::RecordNotFound
-    render nothing: true, status: 404
+    head 404
   end
 
   private
-- 
cgit