Skip to content
Snippets Groups Projects
Verified Commit fa201118 authored by Abdul Wadood's avatar Abdul Wadood :two: Committed by GitLab
Browse files

Merge branch '475252-cleanup-column-default-changes' into 'master'

Remove columns changing default call and include

See merge request !162524



Merged-by: default avatarAbdul Wadood <awadood@gitlab.com>
Approved-by: default avatarAbdul Wadood <awadood@gitlab.com>
Reviewed-by: Rajendra Kadam's avatarRajendra Kadam <rkadam@gitlab.com>
Co-authored-by: Rajendra Kadam's avatarRajendra Kadam <rkadam@gitlab.com>
parents dc365c29 879f87cb
No related branches found
No related tags found
2 merge requests!164749Enable parallel in test-on-omnibus,!162524Remove columns changing default call and include
Pipeline #1419456515 passed with warnings
......@@ -7,7 +7,6 @@ class ApplicationSetting < ApplicationRecord
include ChronicDurationAttribute
include IgnorableColumns
include Sanitizable
include SafelyChangeColumnDefault
ignore_columns %i[elasticsearch_shards elasticsearch_replicas], remove_with: '14.4', remove_after: '2021-09-22'
ignore_columns %i[static_objects_external_storage_auth_token], remove_with: '14.9', remove_after: '2022-03-22'
......@@ -20,8 +19,6 @@ class ApplicationSetting < ApplicationRecord
ignore_columns %i[openai_api_key anthropic_api_key vertex_ai_credentials vertex_ai_access_token], remove_with: '17.3', remove_after: '2024-08-15'
ignore_columns %i[toggle_security_policy_custom_ci lock_toggle_security_policy_custom_ci], remove_with: '17.6', remove_after: '2024-10-17'
columns_changing_default %i[ci_max_total_yaml_size_bytes max_yaml_size_bytes]
INSTANCE_REVIEW_MIN_USERS = 50
GRAFANA_URL_ERROR_MESSAGE = 'Please check your Grafana URL setting in ' \
'Admin area > Settings > Metrics and profiling > Metrics - Grafana'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment