diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-13 18:13:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-13 18:13:52 +0300 |
| commit | 191f3b52a9e0caa72f4e6f7224f0830ba3976d59 (patch) | |
| tree | a65aa3f913284ca1cddba74fd9673261b899f031 /app/models/project_setting.rb | |
| parent | df592d51aeadc1b566abb600e283341876a8f064 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/project_setting.rb')
| -rw-r--r-- | app/models/project_setting.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/app/models/project_setting.rb b/app/models/project_setting.rb index d16fe996672..349625a90f6 100644 --- a/app/models/project_setting.rb +++ b/app/models/project_setting.rb @@ -11,16 +11,6 @@ class ProjectSetting < ApplicationRecord scope :for_projects, ->(projects) { where(project_id: projects) } - ignore_columns %i[ - encrypted_product_analytics_clickhouse_connection_string - encrypted_product_analytics_clickhouse_connection_string_iv - encrypted_jitsu_administrator_password - encrypted_jitsu_administrator_password_iv - jitsu_host - jitsu_project_xid - jitsu_administrator_email - ], remove_with: '16.5', remove_after: '2023-09-22' - ignore_column :jitsu_key, remove_with: '16.7', remove_after: '2023-11-17' attr_encrypted :cube_api_key, |