summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-08-25 13:00:45 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-08-25 13:00:45 +0200
commit99dddac55850fed68ea6f66363c3f083bd4866fa (patch)
tree05075e8e498f3fe511af496bfc687f163b0fa09f
parent946e8d3a93eb8c9e30d1f3baa3b5b28e6c06fbc1 (diff)
downloadgitlab-ce-99dddac55850fed68ea6f66363c3f083bd4866fa.tar.gz
Simplify ci config entry validator implementation
-rw-r--r--lib/gitlab/ci/config/entry/validator.rb9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/gitlab/ci/config/entry/validator.rb b/lib/gitlab/ci/config/entry/validator.rb
index 5ab54d7e218..83bca0d08bc 100644
--- a/lib/gitlab/ci/config/entry/validator.rb
+++ b/lib/gitlab/ci/config/entry/validator.rb
@@ -24,16 +24,11 @@ module Gitlab
private
def location
- predecessors = ancestors.map(&:key).compact
- predecessors.append(key_name).join(':')
+ ancestors.map(&:key).compact.append(key_name).join(':')
end
def key_name
- if key.blank?
- @entry.class.name.to_s.demodulize.underscore.humanize
- else
- key
- end
+ key.presence || @entry.class.name.to_s.demodulize.underscore.humanize
end
end
end