diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/version_check_helper.rb | 4 | ||||
-rw-r--r-- | app/mailers/emails/service_desk.rb | 6 | ||||
-rw-r--r-- | app/models/ci/build.rb | 4 | ||||
-rw-r--r-- | app/models/concerns/chronic_duration_attribute.rb | 2 | ||||
-rw-r--r-- | app/models/container_expiration_policy.rb | 2 | ||||
-rw-r--r-- | app/services/projects/container_repository/cleanup_tags_base_service.rb | 2 | ||||
-rw-r--r-- | app/validators/duration_validator.rb | 2 |
7 files changed, 14 insertions, 8 deletions
diff --git a/app/helpers/version_check_helper.rb b/app/helpers/version_check_helper.rb index 45a4b292eb5..895155e00d1 100644 --- a/app/helpers/version_check_helper.rb +++ b/app/helpers/version_check_helper.rb @@ -10,12 +10,14 @@ module VersionCheckHelper end def gitlab_version_check + return unless show_version_check? + VersionCheck.new.response end strong_memoize_attr :gitlab_version_check def show_security_patch_upgrade_alert? - return false unless show_version_check? && gitlab_version_check + return false unless gitlab_version_check Gitlab::Utils.to_boolean(gitlab_version_check['critical_vulnerability']) end diff --git a/app/mailers/emails/service_desk.rb b/app/mailers/emails/service_desk.rb index 9f3611df2cc..f6595a91bee 100644 --- a/app/mailers/emails/service_desk.rb +++ b/app/mailers/emails/service_desk.rb @@ -211,7 +211,11 @@ module Emails end def issue_description - @issue.description_html.to_s + return '' if @issue.description_html.blank? + + # Remove references etc. from description HTML because external participants + # are no regular users and don't have permission to access them. + ::Banzai::Renderer.post_process(@issue.description_html, {}) end def subject_base diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 2abb8e4be48..750c318819c 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -414,7 +414,7 @@ module Ci end def options_scheduled_at - ChronicDuration.parse(options[:start_in], use_complete_matcher: true)&.seconds&.from_now + ChronicDuration.parse(options[:start_in])&.seconds&.from_now end def action? @@ -738,7 +738,7 @@ module Ci def artifacts_expire_in=(value) self.artifacts_expire_at = if value - ChronicDuration.parse(value, use_complete_matcher: true)&.seconds&.from_now + ChronicDuration.parse(value)&.seconds&.from_now end end diff --git a/app/models/concerns/chronic_duration_attribute.rb b/app/models/concerns/chronic_duration_attribute.rb index 7b7b61fdf06..44b34cf9b2f 100644 --- a/app/models/concerns/chronic_duration_attribute.rb +++ b/app/models/concerns/chronic_duration_attribute.rb @@ -18,7 +18,7 @@ module ChronicDurationAttribute begin new_value = if value.present? - ChronicDuration.parse(value, use_complete_matcher: true).to_i + ChronicDuration.parse(value).to_i else parameters[:default].presence end diff --git a/app/models/container_expiration_policy.rb b/app/models/container_expiration_policy.rb index f643fa7730b..a7ed5e28695 100644 --- a/app/models/container_expiration_policy.rb +++ b/app/models/container_expiration_policy.rb @@ -80,7 +80,7 @@ class ContainerExpirationPolicy < ApplicationRecord end def set_next_run_at - cadence_seconds = ChronicDuration.parse(cadence, use_complete_matcher: true).seconds + cadence_seconds = ChronicDuration.parse(cadence).seconds self.next_run_at = Time.zone.now + cadence_seconds end diff --git a/app/services/projects/container_repository/cleanup_tags_base_service.rb b/app/services/projects/container_repository/cleanup_tags_base_service.rb index 61b09de1643..45557d03502 100644 --- a/app/services/projects/container_repository/cleanup_tags_base_service.rb +++ b/app/services/projects/container_repository/cleanup_tags_base_service.rb @@ -100,7 +100,7 @@ module Projects def older_than_in_seconds strong_memoize(:older_than_in_seconds) do - ChronicDuration.parse(older_than, use_complete_matcher: true).seconds + ChronicDuration.parse(older_than).seconds end end end diff --git a/app/validators/duration_validator.rb b/app/validators/duration_validator.rb index bcdcf665cba..defd28d7d3b 100644 --- a/app/validators/duration_validator.rb +++ b/app/validators/duration_validator.rb @@ -12,7 +12,7 @@ # class DurationValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) - ChronicDuration.parse(value, use_complete_matcher: true) + ChronicDuration.parse(value) rescue ChronicDuration::DurationParseError if options[:message] record.errors.add(:base, options[:message]) |