diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/pipeline/seed/build/cache.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/variables/collection/item.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/ci/pipeline/seed/build/cache.rb b/lib/gitlab/ci/pipeline/seed/build/cache.rb index 7671035b896..a4127ea0be2 100644 --- a/lib/gitlab/ci/pipeline/seed/build/cache.rb +++ b/lib/gitlab/ci/pipeline/seed/build/cache.rb @@ -51,8 +51,6 @@ module Gitlab end def hash_of_the_latest_changes - return unless Feature.enabled?(:ci_file_based_cache, @pipeline.project, default_enabled: true) - ids = files.map { |path| last_commit_id_for_path(path) } ids = ids.compact.sort.uniq diff --git a/lib/gitlab/ci/variables/collection/item.rb b/lib/gitlab/ci/variables/collection/item.rb index aab10aef398..a072036daa8 100644 --- a/lib/gitlab/ci/variables/collection/item.rb +++ b/lib/gitlab/ci/variables/collection/item.rb @@ -37,7 +37,7 @@ module Gitlab case resource when Hash self.new(resource.symbolize_keys) - when ::HasVariable + when ::Ci::HasVariable self.new(resource.to_runner_variable) when self resource.dup |