diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-22 19:12:17 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-22 19:12:17 +0000 |
commit | 3cefaca24938d0f1b891054c9c9b6bc3c541c286 (patch) | |
tree | 0d9a7def4e8243313e87a0615664909b54d80cdb /app | |
parent | 09ae1be1feab2bf2c19d385bf20073d5549e26ab (diff) | |
parent | de24902852454a7805c30912eaca32903f491aa7 (diff) | |
download | gitlab-ce-3cefaca24938d0f1b891054c9c9b6bc3c541c286.tar.gz |
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
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/build.js | 2 | ||||
-rw-r--r-- | app/helpers/builds_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js index e198306e67a..116a47b0907 100644 --- a/app/assets/javascripts/build.js +++ b/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); diff --git a/app/helpers/builds_helper.rb b/app/helpers/builds_helper.rb index fde297c588e..9fc69e12266 100644 --- a/app/helpers/builds_helper.rb +++ b/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 |