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

3 files changed, 3 insertions, 24 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],