Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 9 insertions, 9 deletions

diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index 2e22e67f4e2..eac9eb7aa47 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -14,9 +14,9 @@ describe 'Database schema' do
   IGNORED_FK_COLUMNS = {
     abuse_reports: %w[reporter_id user_id],
     application_settings: %w[performance_bar_allowed_group_id slack_app_id snowplow_app_id eks_account_id eks_access_key_id],
-    approvers: %w[target_id user_id],
     approvals: %w[user_id],
     approver_groups: %w[target_id],
+    approvers: %w[target_id user_id],
     audit_events: %w[author_id entity_id],
     award_emoji: %w[awardable_id user_id],
     aws_roles: %w[role_external_id],
@@ -29,12 +29,13 @@ describe 'Database schema' do
     ci_trigger_requests: %w[commit_id],
     cluster_providers_aws: %w[security_group_id vpc_id access_key_id],
     cluster_providers_gcp: %w[gcp_project_id operation_id],
+    commit_user_mentions: %w[commit_id],
     deploy_keys_projects: %w[deploy_key_id],
     deployments: %w[deployable_id environment_id user_id],
     draft_notes: %w[discussion_id commit_id],
     emails: %w[user_id],
-    events: %w[target_id],
     epics: %w[updated_by_id last_edited_by_id state_id],
+    events: %w[target_id],
     forked_project_links: %w[forked_from_project_id],
     geo_event_log: %w[hashed_storage_attachments_event_id],
     geo_job_artifact_deleted_events: %w[job_artifact_id],
@@ -44,14 +45,14 @@ describe 'Database schema' do
     geo_repository_deleted_events: %w[project_id],
     geo_upload_deleted_events: %w[upload_id model_id],
     gitlab_subscription_histories: %w[gitlab_subscription_id hosted_plan_id namespace_id],
-    import_failures: %w[project_id],
     identities: %w[user_id],
+    import_failures: %w[project_id],
     issues: %w[last_edited_by_id state_id],
     jira_tracker_data: %w[jira_issue_transition_id],
     keys: %w[user_id],
     label_links: %w[target_id],
-    lfs_objects_projects: %w[lfs_object_id project_id],
     ldap_group_links: %w[group_id],
+    lfs_objects_projects: %w[lfs_object_id project_id],
     members: %w[source_id created_by_id],
     merge_requests: %w[last_edited_by_id state_id],
     namespaces: %w[owner_id parent_id],
@@ -63,15 +64,16 @@ describe 'Database schema' do
     open_project_tracker_data: %w[closed_status_id],
     project_group_links: %w[group_id],
     project_statistics: %w[namespace_id],
-    projects: %w[creator_id namespace_id ci_id mirror_user_id],
+    projects: %w[creator_id ci_id mirror_user_id],
     redirect_routes: %w[source_id],
     repository_languages: %w[programming_language_id],
     routes: %w[source_id],
     sent_notifications: %w[project_id noteable_id recipient_id commit_id in_reply_to_discussion_id],
+    slack_integrations: %w[team_id user_id],
     snippets: %w[author_id],
     spam_logs: %w[user_id],
     subscriptions: %w[user_id subscribable_id],
-    slack_integrations: %w[team_id user_id],
+    suggestions: %w[commit_id],
     taggings: %w[tag_id taggable_id tagger_id],
     timelogs: %w[user_id],
     todos: %w[target_id commit_id],
@@ -81,9 +83,7 @@ describe 'Database schema' do
     users_star_projects: %w[user_id],
     vulnerability_identifiers: %w[external_id],
     vulnerability_scanners: %w[external_id],
-    web_hooks: %w[service_id group_id],
-    suggestions: %w[commit_id],
-    commit_user_mentions: %w[commit_id]
+    web_hooks: %w[service_id group_id]
   }.with_indifferent_access.freeze
 
   context 'for table' do