diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-22 19:12:17 +0000 |
---|---|---|
committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2016-11-24 15:33:26 +0000 |
commit | beec9c62d2b9df19cbe888b2444774ac431affa1 (patch) | |
tree | 0db5bba248ac5ad34dd83b6678c49f8ffaae73ca /app/assets | |
parent | ea4696d1a3fd8841359768d05de4cc7181ae755e (diff) | |
download | gitlab-ce-beec9c62d2b9df19cbe888b2444774ac431affa1.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.js | 2 |
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); |