diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-18 15:12:11 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-18 15:12:11 +0000 |
commit | 71b7a9d5b24f62e725896e37c67d550ae80ba525 (patch) | |
tree | 7a088566f586eb3b2b41a81990d1e3b91c161c92 /app/models/metrics | |
parent | 1e88fd9da8572e256a61f0307a5099653735730b (diff) | |
download | gitlab-ce-71b7a9d5b24f62e725896e37c67d550ae80ba525.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/metrics')
-rw-r--r-- | app/models/metrics/dashboard/annotation.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/metrics/dashboard/annotation.rb b/app/models/metrics/dashboard/annotation.rb index 3383dda20c9..d3d3f973398 100644 --- a/app/models/metrics/dashboard/annotation.rb +++ b/app/models/metrics/dashboard/annotation.rb @@ -32,19 +32,19 @@ module Metrics def ending_at_after_starting_at return if ending_at.blank? || starting_at.blank? || starting_at <= ending_at - errors.add(:ending_at, s_("Metrics::Dashboard::Annotation|can't be before starting_at time")) + errors.add(:ending_at, s_("MetricsDashboardAnnotation|can't be before starting_at time")) end def single_ownership return if cluster.nil? ^ environment.nil? - errors.add(:base, s_("Metrics::Dashboard::Annotation|Annotation can't belong to both a cluster and an environment at the same time")) + errors.add(:base, s_("MetricsDashboardAnnotation|Annotation can't belong to both a cluster and an environment at the same time")) end def orphaned_annotation return if cluster.present? || environment.present? - errors.add(:base, s_("Metrics::Dashboard::Annotation|Annotation must belong to a cluster or an environment")) + errors.add(:base, s_("MetricsDashboardAnnotation|Annotation must belong to a cluster or an environment")) end end end |