From 566fc909134586d1746ad60ee455832dec6bc61a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 6 May 2021 14:22:54 +0200
Subject: Add Ruby 3.0 support (#16046)
* Fix issues with POSIX::Spawn, Terrapin and Ruby 3.0
Also improve the Terrapin monkey-patch for the stderr/stdout issue.
* Fix keyword argument handling throughout the codebase
* Monkey-patch Paperclip to fix keyword arguments handling in validators
* Change validation_extensions to please CodeClimate
* Bump microformats from 4.2.1 to 4.3.1
* Allow Ruby 3.0
* Add Ruby 3.0 test target to CircleCI
* Add test for admin dashboard warnings
* Fix admin dashboard warnings on Ruby 3.0
---
app/controllers/api/v1/accounts_controller.rb | 4 ++--
app/controllers/api/v1/follow_requests_controller.rb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'app/controllers/api')
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 996f1b79b..95869f554 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -35,7 +35,7 @@ class Api::V1::AccountsController < Api::BaseController
follow = FollowService.new.call(current_user.account, @account, reblogs: params.key?(:reblogs) ? truthy_param?(:reblogs) : nil, notify: params.key?(:notify) ? truthy_param?(:notify) : nil, with_rate_limit: true)
options = @account.locked? || current_user.account.silenced? ? {} : { following_map: { @account.id => { reblogs: follow.show_reblogs?, notify: follow.notify? } }, requested_map: { @account.id => false } }
- render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(options)
+ render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(**options)
end
def block
@@ -70,7 +70,7 @@ class Api::V1::AccountsController < Api::BaseController
end
def relationships(**options)
- AccountRelationshipsPresenter.new([@account.id], current_user.account_id, options)
+ AccountRelationshipsPresenter.new([@account.id], current_user.account_id, **options)
end
def account_params
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
index b34c76f29..f4b2a74d0 100644
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -29,7 +29,7 @@ class Api::V1::FollowRequestsController < Api::BaseController
end
def relationships(**options)
- AccountRelationshipsPresenter.new([params[:id]], current_user.account_id, options)
+ AccountRelationshipsPresenter.new([params[:id]], current_user.account_id, **options)
end
def load_accounts
--
cgit