summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-11-22 19:12:17 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2016-11-22 19:12:17 +0000
commit3cefaca24938d0f1b891054c9c9b6bc3c541c286 (patch)
tree0d9a7def4e8243313e87a0615664909b54d80cdb /app/assets
parent09ae1be1feab2bf2c19d385bf20073d5549e26ab (diff)
parentde24902852454a7805c30912eaca32903f491aa7 (diff)
downloadgitlab-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/assets')
-rw-r--r--app/assets/javascripts/build.js2
1 files changed, 1 insertions, 1 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);