From 206dfd7daddb888a8115804f2c88794b4230592a Mon Sep 17 00:00:00 2001
From: Daigo 3 Dango <zunda@users.noreply.github.com>
Date: Fri, 10 Jan 2020 10:57:05 -1000
Subject: [PATCH] Clarify keyword arguments with ** (#12769)
This change is to suppress the warning below on on ruby-2.7.0:
- warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call
https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
---
app/helpers/accounts_helper.rb | 2 +-
app/lib/activitypub/activity.rb | 2 +-
app/services/activitypub/process_collection_service.rb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index 53939adfcb..e02bc24475 100644
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -3,7 +3,7 @@
module AccountsHelper
def display_name(account, **options)
if options[:custom_emojify]
- Formatter.instance.format_display_name(account, options)
+ Formatter.instance.format_display_name(account, **options)
else
account.display_name.presence || account.username
end
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 49b1dc9cd0..ee35e1e8da 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -21,7 +21,7 @@ class ActivityPub::Activity
class << self
def factory(json, account, **options)
@json = json
- klass&.new(json, account, options)
+ klass&.new(json, account, **options)
end
private
diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb
index a2a2e70715..e6ccaccc90 100644
--- a/app/services/activitypub/process_collection_service.rb
+++ b/app/services/activitypub/process_collection_service.rb
@@ -37,7 +37,7 @@ class ActivityPub::ProcessCollectionService < BaseService
end
def process_item(item)
- activity = ActivityPub::Activity.factory(item, @account, @options)
+ activity = ActivityPub::Activity.factory(item, @account, **@options)
activity&.perform
end
--
GitLab