Simplify ci config entry validator implementation

99dddac5 · Grzegorz Bizon · 946e8d3a · 99dddac5
Commit 99dddac5 authored Aug 25, 2017 by Grzegorz Bizon
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

lib/gitlab/ci/config/entry/validator.rb lib/gitlab/ci/config/entry/validator.rb +2 -7

No files found.
--- 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
+            ancestors.map(&:key).compact.append(key_name).join(':')
-            predecessors.append(key_name).join(':')
          end
          def key_name
-            if key.blank?
+            key.presence || @entry.class.name.to_s.demodulize.underscore.humanize
-              @entry.class.name.to_s.demodulize.underscore.humanize
-            else
-              key
-            end
          end
        end
      end