diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-22 00:08:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-22 00:08:28 +0300 |
| commit | 0a93f691bf210da97fcefe0ddf80b38b0b186a99 (patch) | |
| tree | cf17fdecf913d0576a4ec3eba0b3704c06c86470 /lib | |
| parent | 07d811cd3cf4d3a1802363532756bf69cfc6346f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/database/background_migration/health_status.rb | 9 | ||||
| -rw-r--r-- | lib/gitlab/database/background_migration/health_status/signals.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/subscription_portal.rb | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/lib/gitlab/database/background_migration/health_status.rb b/lib/gitlab/database/background_migration/health_status.rb index c66f30ffecc..96905fd0bc5 100644 --- a/lib/gitlab/database/background_migration/health_status.rb +++ b/lib/gitlab/database/background_migration/health_status.rb @@ -31,9 +31,12 @@ module Gitlab end def self.log_signal(signal, migration) - Gitlab::AppLogger.info( - message: "#{migration} signaled: #{signal}", - migration_id: migration.id + Gitlab::BackgroundMigration::Logger.info( + migration_id: migration.id, + health_status_indicator: signal.indicator_class.to_s, + indicator_signal: signal.short_name, + signal_reason: signal.reason, + message: "#{migration} signaled: #{signal}" ) end end diff --git a/lib/gitlab/database/background_migration/health_status/signals.rb b/lib/gitlab/database/background_migration/health_status/signals.rb index be741a9d91b..534c4330cf2 100644 --- a/lib/gitlab/database/background_migration/health_status/signals.rb +++ b/lib/gitlab/database/background_migration/health_status/signals.rb @@ -28,8 +28,6 @@ module Gitlab end # :nocov: - private - def short_name self.class.name.demodulize end diff --git a/lib/gitlab/subscription_portal.rb b/lib/gitlab/subscription_portal.rb index 6d77acd7f33..723b8265479 100644 --- a/lib/gitlab/subscription_portal.rb +++ b/lib/gitlab/subscription_portal.rb @@ -100,3 +100,6 @@ Gitlab::SubscriptionPortal::PAYMENT_VALIDATION_FORM_ID = Gitlab::SubscriptionPor Gitlab::SubscriptionPortal::RENEWAL_SERVICE_EMAIL = Gitlab::SubscriptionPortal.renewal_service_email.freeze Gitlab::SubscriptionPortal::REGISTRATION_VALIDATION_FORM_URL = Gitlab::SubscriptionPortal.registration_validation_form_url.freeze Gitlab::SubscriptionPortal::REGISTRATION_VALIDATION_FORM_ID = Gitlab::SubscriptionPortal.registration_validation_form_id.freeze +Gitlab::SubscriptionPortal::SUBSCRIPTION_PORTAL_ADMIN_EMAIL = Gitlab::SubscriptionPortal.subscription_portal_admin_email.freeze +Gitlab::SubscriptionPortal::SUBSCRIPTION_PORTAL_ADMIN_TOKEN = Gitlab::SubscriptionPortal.subscription_portal_admin_token.freeze +Gitlab::SubscriptionPortal::SUBSCRIPTIONS_MANAGE_URL = ::Gitlab::SubscriptionPortal.subscriptions_manage_url.freeze |