diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-04-25 15:50:46 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-04-26 11:06:57 +0200 |
| commit | f7a78c4238d9e012bb4bad6632c3917ec3927451 (patch) | |
| tree | 570beaa7adfe99f6fdb79154b565ab001c261f91 | |
| parent | 2e63e50f2ed34d918289e80b2ec8c5552e8da95b (diff) | |
| download | gitlab-ce-27376-bvl-load-pipelinestatus-in-batch.tar.gz | |
Remove unneeded conditional27376-bvl-load-pipelinestatus-in-batch
| -rw-r--r-- | lib/gitlab/cache/ci/project_pipeline_status.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/cache/ci/project_pipeline_status.rb b/lib/gitlab/cache/ci/project_pipeline_status.rb index d4e3922177d..4fc9a075edc 100644 --- a/lib/gitlab/cache/ci/project_pipeline_status.rb +++ b/lib/gitlab/cache/ci/project_pipeline_status.rb @@ -18,7 +18,7 @@ module Gitlab def self.load_in_batch_for_projects(projects) cached_results_for_projects(projects).zip(projects).each do |result, project| project.pipeline_status = new(project, result) - project.pipeline_status.load_status unless project.pipeline_status.loaded? + project.pipeline_status.load_status end end diff --git a/spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb b/spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb index cfe0675bfdc..b386852b196 100644 --- a/spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb +++ b/spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb @@ -85,7 +85,8 @@ describe Gitlab::Cache::Ci::ProjectPipelineStatus, :redis do end it "doesn't load the status separatly" do - expect_any_instance_of(described_class).not_to receive(:load_status) + expect_any_instance_of(described_class).not_to receive(:load_from_project) + expect_any_instance_of(described_class).not_to receive(:load_from_cache) described_class.load_in_batch_for_projects([project]) end |