Upgrade to Rails 5.0.0.1

2016-08-17 17:56:23 +02:00
parent ff2cbc0753
commit 10ba09f546
47 changed files with 398 additions and 291 deletions
--- 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