From ae72d71da85732ec9ceb9723953fe6ca1df0fdf6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 8 Nov 2019 21:06:38 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/db/schema_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/db') diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb index d340cec8b70..e8b30868801 100644 --- a/spec/db/schema_spec.rb +++ b/spec/db/schema_spec.rb @@ -13,7 +13,7 @@ describe 'Database schema' do # EE: edit the ee/spec/db/schema_support.rb IGNORED_FK_COLUMNS = { abuse_reports: %w[reporter_id user_id], - application_settings: %w[performance_bar_allowed_group_id slack_app_id snowplow_site_id eks_account_id eks_access_key_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], -- cgit v1.2.3