Revertしたコミットに注意書きを追加

kmycode · Mar 6, 2024 · 2ab2e0f · 2ab2e0f
1 parent 372400c
commit 2ab2e0f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git a/app/models/account_suggestions/friends_of_friends_source.rb b/app/models/account_suggestions/friends_of_friends_source.rb
@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+# Reverted this commit.temporarily because load issues.
+# Whenever a manual merge occurs, be sure to check the following commits.
+# Hash: ee8d0b94473df357677cd1f82581251ce0423c01
+# Message: Fix follow suggestions potentially including silenced or blocked accounts (#29306)
+
 class AccountSuggestions::FriendsOfFriendsSource < AccountSuggestions::Source
   def get(account, limit: DEFAULT_LIMIT)
     Account.find_by_sql([<<~SQL.squish, { id: account.id, limit: limit }]).map { |row| [row.id, key] }

diff --git a/app/models/account_suggestions/similar_profiles_source.rb b/app/models/account_suggestions/similar_profiles_source.rb
@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+# Reverted this commit.temporarily because load issues.
+# Whenever a manual merge occurs, be sure to check the following commits.
+# Hash: ee8d0b94473df357677cd1f82581251ce0423c01
+# Message: Fix follow suggestions potentially including silenced or blocked accounts (#29306)
+
 class AccountSuggestions::SimilarProfilesSource < AccountSuggestions::Source
   class QueryBuilder < AccountSearchService::QueryBuilder
     def must_clauses

diff --git a/app/models/account_suggestions/source.rb b/app/models/account_suggestions/source.rb
@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+# Reverted this commit.temporarily because load issues.
+# Whenever a manual merge occurs, be sure to check the following commits.
+# Hash: ee8d0b94473df357677cd1f82581251ce0423c01
+# Message: Fix follow suggestions potentially including silenced or blocked accounts (#29306)
+
 class AccountSuggestions::Source
   DEFAULT_LIMIT = 10
 

diff --git a/spec/models/account_suggestions/friends_of_friends_source_spec.rb b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Reverted this commit.temporarily because load issues.
+# Whenever a manual merge occurs, be sure to check the following commits.
+# Hash: ee8d0b94473df357677cd1f82581251ce0423c01
+# Message: Fix follow suggestions potentially including silenced or blocked accounts (#29306)
diff --git a/spec/models/account_suggestions/source_spec.rb b/spec/models/account_suggestions/source_spec.rb
@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+# Reverted this commit.temporarily because load issues.
+# Whenever a manual merge occurs, be sure to check the following commits.
+# Hash: ee8d0b94473df357677cd1f82581251ce0423c01
+# Message: Fix follow suggestions potentially including silenced or blocked accounts (#29306)
+
 require 'rails_helper'
 
 RSpec.describe AccountSuggestions::Source do