Commit 3cefaca2 authored by Kamil Trzciński's avatar Kamil Trzciński

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

Fix exceptions when loading build trace

## What does this MR do?

This MR fixes exceptions when loading build trace.

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [x] Tests added for this feature/bug

## What are the relevant issue numbers?

Closes #24638

See merge request !7658
parents 09ae1be1 de249028
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
this.pageUrl = options.pageUrl; this.pageUrl = options.pageUrl;
this.buildUrl = options.buildUrl; this.buildUrl = options.buildUrl;
this.buildStatus = options.buildStatus; this.buildStatus = options.buildStatus;
this.state = options.state1; this.state = options.logState;
this.buildStage = options.buildStage; this.buildStage = options.buildStage;
this.updateDropdown = bind(this.updateDropdown, this); this.updateDropdown = bind(this.updateDropdown, this);
this.$document = $(document); this.$document = $(document);
......
...@@ -12,7 +12,7 @@ module BuildsHelper ...@@ -12,7 +12,7 @@ module BuildsHelper
build_url: namespace_project_build_url(@project.namespace, @project, @build, :json), build_url: namespace_project_build_url(@project.namespace, @project, @build, :json),
build_status: @build.status, build_status: @build.status,
build_stage: @build.stage, build_stage: @build.stage,
state1: @build.trace_with_state[:state] log_state: @build.trace_with_state[:state].to_s
} }
end end
end end
---
title: Fix exceptions when loading build trace
merge_request: 7658
author:
This diff is collapsed.
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
build_url: 'http://example.com/root/test-build/builds/2.json', build_url: 'http://example.com/root/test-build/builds/2.json',
build_status: 'passed', build_status: 'passed',
build_stage: 'test', build_stage: 'test',
state1: 'buildstate' }} log_state: 'buildstate' }}
%p.build-detail-row %p.build-detail-row
The artifacts will be removed in The artifacts will be removed in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment