diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-22 14:48:14 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-22 14:48:14 +0100 |
| commit | de24902852454a7805c30912eaca32903f491aa7 (patch) | |
| tree | 844dd2da3c7a35282423644eed4209e2e5d9231c | |
| parent | 0914efbfceb32c0d303b5113bc13f86cc1b120cd (diff) | |
| download | gitlab-ce-fix/build-without-trace-exceptions.tar.gz | |
Improve name of build log state data attributefix/build-without-trace-exceptions
| -rw-r--r-- | app/assets/javascripts/build.js | 2 | ||||
| -rw-r--r-- | app/helpers/builds_helper.rb | 2 | ||||
| -rw-r--r-- | spec/javascripts/fixtures/build.html.haml | 2 |
3 files changed, 3 insertions, 3 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 9662ac7e341..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].to_s + log_state: @build.trace_with_state[:state].to_s } end end diff --git a/spec/javascripts/fixtures/build.html.haml b/spec/javascripts/fixtures/build.html.haml index 27136beb14c..06b49516e5c 100644 --- a/spec/javascripts/fixtures/build.html.haml +++ b/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 |