diff options
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/api/salmon_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/api/subscriptions_controller.rb | 8 | ||||
-rw-r--r-- | app/controllers/api_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/auth/registrations_controller.rb | 4 | ||||
-rw-r--r-- | app/controllers/oauth/applications_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/xrd_controller.rb | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/app/controllers/api/salmon_controller.rb b/app/controllers/api/salmon_controller.rb index b15aefee9..329b258a4 100644 --- a/app/controllers/api/salmon_controller.rb +++ b/app/controllers/api/salmon_controller.rb @@ -4,7 +4,7 @@ class Api::SalmonController < ApiController def update ProcessInteractionService.new.(request.body.read, @account) - render nothing: true, status: 201 + head 201 end private diff --git a/app/controllers/api/subscriptions_controller.rb b/app/controllers/api/subscriptions_controller.rb index 91b987ce4..e923b9b66 100644 --- a/app/controllers/api/subscriptions_controller.rb +++ b/app/controllers/api/subscriptions_controller.rb @@ -4,9 +4,9 @@ class Api::SubscriptionsController < ApiController def show if @account.subscription(api_subscription_url(@account.id)).valid?(params['hub.topic'], params['hub.verify_token']) - render text: HTMLEntities.new.encode(params['hub.challenge']), status: 200 + render plain: HTMLEntities.new.encode(params['hub.challenge']), status: 200 else - render nothing: true, status: 404 + head 404 end end @@ -15,9 +15,9 @@ class Api::SubscriptionsController < ApiController if @account.subscription(api_subscription_url(@account.id)).verify(body, request.headers['HTTP_X_HUB_SIGNATURE']) ProcessFeedService.new.(body, @account) - render nothing: true, status: 201 + head 201 else - render nothing: true, status: 202 + head 202 end end diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 35f1e62c5..8a2712476 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -1,6 +1,6 @@ class ApiController < ApplicationController protect_from_forgery with: :null_session - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token protected diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index ad0fd4437..8472edc69 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -11,8 +11,8 @@ class Auth::RegistrationsController < Devise::RegistrationsController end def configure_sign_up_params - devise_parameter_sanitizer.for(:sign_up) do |u| - u.permit(:email, :password, :password_confirmation, account_attributes: [:username]) + devise_parameter_sanitizer.permit(:sign_up) do |u| + u.permit({ account_attributes: [:username] }, :email, :password, :password_confirmation) end end diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb index 4614ef2f7..47935bf7c 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -1,5 +1,5 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController - before_filter :authenticate_user! + before_action :authenticate_user! def index @applications = current_user.oauth_applications 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 |