diff --git a/app/models/abuse/event.rb b/app/models/abuse/event.rb index 5700c1c73e6fc9a329d355546e46bf8703a1ea56..63a0e311a3db853211434c08602e1f5c048d447e 100644 --- a/app/models/abuse/event.rb +++ b/app/models/abuse/event.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Abuse - class Event < ApplicationRecord + class Event < MainClusterwide::ApplicationRecord self.table_name = 'abuse_events' validates :category, presence: true diff --git a/app/models/abuse/trust_score.rb b/app/models/abuse/trust_score.rb index 2e8b7ed66861c64887414df138a269a40e431766..9908e2e7a04c102ac6323a3b9f6d31dbdc2d7ed9 100644 --- a/app/models/abuse/trust_score.rb +++ b/app/models/abuse/trust_score.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Abuse - class TrustScore < ApplicationRecord + class TrustScore < MainClusterwide::ApplicationRecord self.table_name = 'abuse_trust_scores' enum source: Enums::Abuse::Source.sources diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb index b2f0152f0358da437e6d413b94fad313c6e7b1f0..413d4bb34081310a4bc09417a48d0fe27d9f9141 100644 --- a/app/models/abuse_report.rb +++ b/app/models/abuse_report.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class AbuseReport < ApplicationRecord +class AbuseReport < MainClusterwide::ApplicationRecord include CacheMarkdownField include Sortable include Gitlab::FileTypeDetection diff --git a/app/models/admin/abuse_report_assignee.rb b/app/models/admin/abuse_report_assignee.rb index d8f6f8ded00ae6137438ab22b7123aa18ca92d2e..83bb5b1dcdf1c334ef2c980e7a61fbfbb256f736 100644 --- a/app/models/admin/abuse_report_assignee.rb +++ b/app/models/admin/abuse_report_assignee.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Admin - class AbuseReportAssignee < ApplicationRecord + class AbuseReportAssignee < MainClusterwide::ApplicationRecord self.table_name = 'abuse_report_assignees' belongs_to :abuse_report, touch: true diff --git a/app/models/resource_events/abuse_report_event.rb b/app/models/resource_events/abuse_report_event.rb index 5881f87241d8a837f7869c195b054ae8e3822455..ed0f7dcff292b2b9c8b443d1f49ea109b5c82480 100644 --- a/app/models/resource_events/abuse_report_event.rb +++ b/app/models/resource_events/abuse_report_event.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module ResourceEvents - class AbuseReportEvent < ApplicationRecord + class AbuseReportEvent < MainClusterwide::ApplicationRecord include AbuseReportEventsHelper belongs_to :abuse_report, optional: false diff --git a/db/docs/abuse_events.yml b/db/docs/abuse_events.yml index b399c9573160844b956daa38e62cfadf53e5a35c..7bc509133e2b68b05d615be8998177d601e2dc2d 100644 --- a/db/docs/abuse_events.yml +++ b/db/docs/abuse_events.yml @@ -7,4 +7,4 @@ feature_categories: description: Captures events of potential abuse introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115258 milestone: '16.1' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_clusterwide diff --git a/db/docs/abuse_report_assignees.yml b/db/docs/abuse_report_assignees.yml index 5b07dacc7bbcdbd435b5bc8b03dd894044f7fad4..03d9c157b01f9781707b1a470ddbe9bd1f1d9eee 100644 --- a/db/docs/abuse_report_assignees.yml +++ b/db/docs/abuse_report_assignees.yml @@ -7,4 +7,4 @@ feature_categories: description: Stores information linking abuse reports and users (assignee) introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134240 milestone: '16.7' -gitlab_schema: gitlab_main_cell +gitlab_schema: gitlab_main_clusterwide diff --git a/db/docs/abuse_report_events.yml b/db/docs/abuse_report_events.yml index ea19a44c39d527ed7c41c9c74a87e4242f9f1b45..37d85d920fa143eb8737f2da4cdc9f879c6fe5bf 100644 --- a/db/docs/abuse_report_events.yml +++ b/db/docs/abuse_report_events.yml @@ -7,4 +7,4 @@ feature_categories: description: Stores actions taken on abuse reports. introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119199 milestone: "16.0" -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_clusterwide diff --git a/db/docs/abuse_report_user_mentions.yml b/db/docs/abuse_report_user_mentions.yml index 00bf5c928c428c34f67232d33fa9a44df287e92f..6c0ceb61351bb92ee813d3894c44583fb87ffad9 100644 --- a/db/docs/abuse_report_user_mentions.yml +++ b/db/docs/abuse_report_user_mentions.yml @@ -7,4 +7,4 @@ feature_categories: description: User mentions in abuse report notes introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132505 milestone: '16.5' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_clusterwide diff --git a/db/docs/abuse_reports.yml b/db/docs/abuse_reports.yml index 896c978f9d7fc38cf485c6ded7880378f5346044..b281524b4e26207190e4fdef877b3a4e6ffaa3c4 100644 --- a/db/docs/abuse_reports.yml +++ b/db/docs/abuse_reports.yml @@ -7,4 +7,4 @@ feature_categories: description: Stores abuse reports from other users. introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/cba7f20dc8614d12e3eeda6e14f454aeb22b9b54 milestone: '7.13' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_clusterwide diff --git a/db/docs/abuse_trust_scores.yml b/db/docs/abuse_trust_scores.yml index 75a8888e0698294b4f8082f55dd64592553e7852..5b145d77a84ba0cafd9587bc5bc16cdf744209c8 100644 --- a/db/docs/abuse_trust_scores.yml +++ b/db/docs/abuse_trust_scores.yml @@ -7,4 +7,4 @@ feature_categories: description: Aggregates per-user scores related to potential product abuse. introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117301 milestone: '15.11' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_clusterwide diff --git a/spec/lib/gitlab/database/sharding_key_spec.rb b/spec/lib/gitlab/database/sharding_key_spec.rb index c82cdf245275b69f3f7ba56937e4cd9df39dd423..d211985a1a43431e984a53d91cb153e31179cf8b 100644 --- a/spec/lib/gitlab/database/sharding_key_spec.rb +++ b/spec/lib/gitlab/database/sharding_key_spec.rb @@ -9,7 +9,6 @@ # the table name to remove this once a decision has been made. let(:allowed_to_be_missing_sharding_key) do [ - 'abuse_report_assignees', # https://gitlab.com/gitlab-org/gitlab/-/issues/432365 'sbom_occurrences_vulnerabilities', # https://gitlab.com/gitlab-org/gitlab/-/issues/432900 'p_ci_pipeline_variables', # https://gitlab.com/gitlab-org/gitlab/-/issues/436360 'ml_model_metadata', # has a desired sharding key instead.