Merge remote-tracking branch 'parent/main' into upstream-20240918

2024-09-18 08:31:34 +09:00 · 2024-09-18 08:31:34 +09:00 · 4ce35dd837
commit 4ce35dd837
parent fe051aa32d 3e91c101b3
188 changed files with 1994 additions and 980 deletions
--- a/app/models/concerns/account/attribution_domains.rb
+++ b/app/models/concerns/account/attribution_domains.rb
@ -13,7 +13,11 @@ module Account::AttributionDomains

  def attribution_domains_as_text=(str)
    self[:attribution_domains] = str.split.filter_map do |line|
-      line.strip.delete_prefix('*.')
+      line
+        .strip
+        .delete_prefix('http://')
+        .delete_prefix('https://')
+        .delete_prefix('*.')
    end
  end