Fix: CI token removal regression from build trace

1 files changed, 10 insertions, 7 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 8096d4fa5ae..f0cf20247dc 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -145,12 +145,6 @@ module Ci
       html ||= ''
     end
 
-    def trace
-      if project && read_attribute(:trace).present?
-        read_attribute(:trace).gsub(project.token, 'xxxxxx')
-      end
-    end
-
     def started?
       !pending? && !canceled? && started_at
     end
@@ -225,7 +219,7 @@ module Ci
       end
     end
 
-    def trace
+    def raw_trace
       if File.exist?(path_to_trace)
         File.read(path_to_trace)
       else
@@ -234,6 +228,15 @@ module Ci
       end
     end
 
+    def trace
+      trace = raw_trace
+      if project && trace.present?
+        trace.gsub(project.token, 'xxxxxx')
+      else
+        trace
+      end
+    end
+
     def trace=(trace)
       unless Dir.exists? dir_to_trace
         FileUtils.mkdir_p dir_to_trace