Revert adding `Empty` extended status to avoid N+1 queries

5 files changed, 5 insertions, 59 deletions

diff --git a/lib/gitlab/ci/status/build/common.rb b/lib/gitlab/ci/status/build/common.rb
index 639e88ebf1f..52d2df0a40a 100644
--- a/lib/gitlab/ci/status/build/common.rb
+++ b/lib/gitlab/ci/status/build/common.rb
@@ -6,7 +6,8 @@ module Gitlab
           def illustration
             {
               image: 'illustrations/skipped-job_empty.svg',
-              size: 'svg-430'
+              size: 'svg-430',
+              title: _('This job does not have a trace.'),
             }
           end
 
diff --git a/lib/gitlab/ci/status/build/empty.rb b/lib/gitlab/ci/status/build/empty.rb
deleted file mode 100644
index 3e598877602..00000000000
--- a/lib/gitlab/ci/status/build/empty.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Gitlab
-  module Ci
-    module Status
-      module Build
-        class Empty < Status::Extended
-          def illustration
-            {
-              image: 'illustrations/skipped-job_empty.svg',
-              size: 'svg-430',
-              title: _('This job does not have a trace.')
-            }
-          end
-
-          def self.matches?(build, user)
-            !build.has_trace?
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/ci/status/build/factory.rb b/lib/gitlab/ci/status/build/factory.rb
index 9b3a97a0f0f..2b26ebb45a1 100644
--- a/lib/gitlab/ci/status/build/factory.rb
+++ b/lib/gitlab/ci/status/build/factory.rb
@@ -9,8 +9,7 @@ module Gitlab
               Status::Build::Canceled,
               Status::Build::Created,
               Status::Build::Pending,
-              Status::Build::Skipped,
-              Status::Build::Empty],
+              Status::Build::Skipped],
              [Status::Build::Cancelable,
               Status::Build::Retryable],
              [Status::Build::Failed],
diff --git a/spec/lib/gitlab/ci/status/build/empty_spec.rb b/spec/lib/gitlab/ci/status/build/empty_spec.rb
deleted file mode 100644
index 379a5a9849b..00000000000
--- a/spec/lib/gitlab/ci/status/build/empty_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Ci::Status::Build::Empty do
-  let(:build) { create(:ci_build, :running) }
-  let(:status) { double('core status') }
-  let(:user) { double('user') }
-
-  subject { described_class.new(status) }
-
-  describe '#illustration' do
-    it 'provides an empty state illustration' do
-      expect(subject.illustration).not_to be_empty
-    end
-  end
-
-  describe '.matches?' do
-    subject { described_class.matches?(build, user) }
-
-    context 'when a build has trace' do
-      let(:build) { create(:ci_build, :trace_artifact) }
-
-      it { is_expected.to be_falsy }
-    end
-
-    context 'with a build that has not been retried' do
-      let(:build) { create(:ci_build, :running) }
-
-      it { is_expected.to be_truthy }
-    end
-  end
-end
diff --git a/spec/lib/gitlab/ci/status/build/factory_spec.rb b/spec/lib/gitlab/ci/status/build/factory_spec.rb
index 83d48f1bc73..d53a7d468e3 100644
--- a/spec/lib/gitlab/ci/status/build/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb
@@ -75,8 +75,7 @@ describe Gitlab::Ci::Status::Build::Factory do
 
       it 'matches correct extended statuses' do
         expect(factory.extended_statuses)
-          .to eq [Gitlab::Ci::Status::Build::Empty,
-                  Gitlab::Ci::Status::Build::Retryable,
+          .to eq [Gitlab::Ci::Status::Build::Retryable,
                   Gitlab::Ci::Status::Build::Failed]
       end
 
@@ -162,8 +161,7 @@ describe Gitlab::Ci::Status::Build::Factory do
 
     it 'matches correct extended statuses' do
       expect(factory.extended_statuses)
-        .to eq [Gitlab::Ci::Status::Build::Empty,
-                Gitlab::Ci::Status::Build::Cancelable]
+        .to eq [Gitlab::Ci::Status::Build::Cancelable]
     end
 
     it 'fabricates a canceable build status' do