Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 12 deletions

diff --git a/app/services/ci/update_build_state_service.rb b/app/services/ci/update_build_state_service.rb
index 874f4bf459a..576300a64e6 100644
--- a/app/services/ci/update_build_state_service.rb
+++ b/app/services/ci/update_build_state_service.rb
@@ -19,8 +19,6 @@ module Ci
     end
 
     def execute
-      overwrite_trace! if has_trace?
-
       unless accept_available?
         return update_build_state!
       end
@@ -34,12 +32,6 @@ module Ci
 
     private
 
-    def overwrite_trace!
-      metrics.increment_trace_operation(operation: :overwrite)
-
-      build.trace.set(params[:trace]) if Gitlab::Ci::Features.trace_overwrite?
-    end
-
     def ensure_pending_state!
       pending_state.created_at
     end
@@ -151,10 +143,6 @@ module Ci
       params.dig(:state).to_s
     end
 
-    def has_trace?
-      params.dig(:trace).present?
-    end
-
     def has_checksum?
       trace_checksum.present?
     end