diff options
Diffstat (limited to 'app/models/alert_management')
| -rw-r--r-- | app/models/alert_management/alert.rb | 10 | ||||
| -rw-r--r-- | app/models/alert_management/http_integration.rb | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/models/alert_management/alert.rb b/app/models/alert_management/alert.rb index 7090d9f4ea1..156111ffaf3 100644 --- a/app/models/alert_management/alert.rb +++ b/app/models/alert_management/alert.rb @@ -20,7 +20,13 @@ module AlertManagement resolved: 2, ignored: 3 }.freeze - private_constant :STATUSES + + STATUS_DESCRIPTIONS = { + triggered: 'Investigation has not started', + acknowledged: 'Someone is actively investigating the problem', + resolved: 'No further work is required', + ignored: 'No action will be taken on the alert' + }.freeze belongs_to :project belongs_to :issue, optional: true @@ -271,4 +277,4 @@ module AlertManagement end end -AlertManagement::Alert.prepend_if_ee('EE::AlertManagement::Alert') +AlertManagement::Alert.prepend_mod_with('AlertManagement::Alert') diff --git a/app/models/alert_management/http_integration.rb b/app/models/alert_management/http_integration.rb index e98c770c364..2caa9a18445 100644 --- a/app/models/alert_management/http_integration.rb +++ b/app/models/alert_management/http_integration.rb @@ -10,7 +10,7 @@ module AlertManagement attr_encrypted :token, mode: :per_attribute_iv, - key: Settings.attr_encrypted_db_key_base_truncated, + key: Settings.attr_encrypted_db_key_base_32, algorithm: 'aes-256-gcm' default_value_for(:endpoint_identifier, allows_nil: false) { SecureRandom.hex(8) } |