diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb index c3fa875bfe62234e4ed0bacac50cadd23d53adfc..9a681c65d4b17dd2e79b3083103243d6f966cf2c 100644 --- a/lib/ci/gitlab_ci_yaml_processor.rb +++ b/lib/ci/gitlab_ci_yaml_processor.rb @@ -51,11 +51,9 @@ module Ci end def stage_seeds(pipeline) - trigger_request = pipeline.trigger_requests.first - seeds = @stages.uniq.map do |stage| builds = builds_for_stage_and_ref( - stage, pipeline.ref, pipeline.tag?, trigger_request) + stage, pipeline.ref, pipeline.tag?, pipeline.source) Gitlab::Ci::Stage::Seed.new(pipeline, stage, builds) if builds.any? end diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 598f642415a598400171ceafb1957e1f6e24da39..2343446bf223f39edede2aba17e5416fab5e8f87 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -49,8 +49,7 @@ module Gitlab end def self.enabled? - # Gitlab.config.gitaly.enabled - false + Gitlab.config.gitaly.enabled end def self.feature_enabled?(feature, status: MigrationStatus::OPT_IN)