Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/application_setting.rb')
-rw-r--r--app/models/application_setting.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index a71b47e88d8..827f8bc93be 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -38,7 +38,7 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord
encrypted_tofa_url
encrypted_tofa_url_iv
vertex_project
- ], remove_with: '16.2', remove_after: '2023-06-22'
+ ], remove_with: '16.3', remove_after: '2023-07-22'
INSTANCE_REVIEW_MIN_USERS = 50
GRAFANA_URL_ERROR_MESSAGE = 'Please check your Grafana URL setting in ' \
@@ -596,6 +596,13 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord
allow_blank: true,
public_url: ADDRESSABLE_URL_VALIDATION_OPTIONS
+ with_options(presence: true, if: :slack_app_enabled?) do
+ validates :slack_app_id
+ validates :slack_app_secret
+ validates :slack_app_signing_secret
+ validates :slack_app_verification_token
+ end
+
with_options(presence: true, numericality: { only_integer: true, greater_than: 0 }) do
validates :throttle_unauthenticated_api_requests_per_period
validates :throttle_unauthenticated_api_period_in_seconds