diff options
| author | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-06-07 22:45:24 +0900 |
|---|---|---|
| committer | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-06-08 00:34:59 +0900 |
| commit | 451b684d8474d5c16007d69f462f08f2191820f2 (patch) | |
| tree | 4290fb433311a54256973de7b7c19f5777911da6 | |
| parent | 835f97a7e26ae7b199d886f35e33255016538134 (diff) | |
| download | gitlab-ce-451b684d8474d5c16007d69f462f08f2191820f2.tar.gz | |
Use source instead of trigger_requests in stage_seeds
| -rw-r--r-- | lib/ci/gitlab_ci_yaml_processor.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb index c3fa875bfe6..9a681c65d4b 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 598f642415a..2343446bf22 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) |