kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Improve name of build log state data attribute

Browse source
This commit is contained in:
Grzegorz Bizon 2016-11-22 14:48:14 +01:00
parent 0914efbfce
commit de24902852
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/build.js
View file

@ -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);

2
app/helpers/builds_helper.rb
View file

@ -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].to_s log_state: @build.trace_with_state[:state].to_s
} }
end end
end end

2
spec/javascripts/fixtures/build.html.haml
View file

@ -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