diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 06:06:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 06:06:24 +0000 |
| commit | 1ef4b65f55f4fc6524a47050b4f6d686beb81d3a (patch) | |
| tree | 3efc2710e564b86e5e2420d65457f656454006bb /spec/db | |
| parent | 18a102a5b95198b6bc8db2589de6353997a33543 (diff) | |
| download | gitlab-ce-1ef4b65f55f4fc6524a47050b4f6d686beb81d3a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/db')
| -rw-r--r-- | spec/db/schema_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb index e4eddb87858..d340cec8b70 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], + application_settings: %w[performance_bar_allowed_group_id slack_app_id snowplow_site_id eks_account_id eks_access_key_id], approvers: %w[target_id user_id], approvals: %w[user_id], approver_groups: %w[target_id], |