summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/ci/runner.rb16
1 files changed, 10 insertions, 6 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index f5813589492..cf4d3236519 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -26,12 +26,7 @@ module Ci
.where("ci_runner_projects.gl_project_id = :project_id OR ci_runners.is_shared = true", project_id: project_id)
end
- validate do |runner|
- unless runner.has_tags? || runner.run_untagged?
- errors.add(:tags_list,
- 'can not be empty when runner is not allowed to pick untagged jobs')
- end
- end
+ validate :verify_tags_constraints
acts_as_taggable
@@ -107,5 +102,14 @@ module Ci
def has_tags?
tag_list.any?
end
+
+ private
+
+ def verify_tags_constraints
+ unless has_tags? || run_untagged?
+ errors.add(:tags_list,
+ 'can not be empty when runner is not allowed to pick untagged jobs')
+ end
+ end
end
end