Merge branch 'fix/build-without-trace-exceptions' into 'master'

app/assets/javascripts/build.js

@@ -12,7 +12,7 @@
       this.pageUrl = options.pageUrl;
       this.buildUrl = options.buildUrl;
       this.buildStatus = options.buildStatus;
-      this.state = options.state1;
+      this.state = options.logState;
       this.buildStage = options.buildStage;
       this.updateDropdown = bind(this.updateDropdown, this);
       this.$document = $(document);

app/helpers/builds_helper.rb

@@ -12,7 +12,7 @@ module BuildsHelper
       build_url: namespace_project_build_url(@project.namespace, @project, @build, :json),
       build_status: @build.status,
       build_stage: @build.stage,
-      state1: @build.trace_with_state[:state]
+      log_state: @build.trace_with_state[:state].to_s
     }
   end
 end

changelogs/unreleased/fix-build-without-trace-exceptions.yml

+---
+title: Fix exceptions when loading build trace
+merge_request: 7658
+author: 

spec/javascripts/fixtures/build.html.haml

@@ -54,7 +54,7 @@
   build_url: 'http://example.com/root/test-build/builds/2.json',
   build_status: 'passed',
   build_stage: 'test',
-  state1: 'buildstate' }}
+  log_state: 'buildstate' }}
 
 %p.build-detail-row
   The artifacts will be removed in