summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-19 13:42:47 +0000
committerRémy Coutable <remy@rymai.me>2016-07-19 16:35:27 +0200
commit13f50ff29ab52c6152dc0e6f57dfced63de7fca9 (patch)
tree421bc2f92ace8ad3e6036f51092134626558c286 /spec/lib
parent510d53d037e6de83d43418fab5353fdedac4ae97 (diff)
downloadgitlab-ce-13f50ff29ab52c6152dc0e6f57dfced63de7fca9.tar.gz
Merge branch 'fix-retries-on-old-builds' into 'master'
Use value of `yaml_variables` and `when` from config_processor if undefined ## What does this MR do? Uses `yaml_variables` and `when` from config_processor if values for these are undefined. ## Why was this MR needed? Old builds doesn't have this columns initialised. Thus makes the retries on these builds to not work properly. This is regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5296. ## Does this MR meet the acceptance criteria? - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) See merge request !5342
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/badge/build_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/badge/build_spec.rb b/spec/lib/gitlab/badge/build_spec.rb
index 2034445a197..f3b522a02f5 100644
--- a/spec/lib/gitlab/badge/build_spec.rb
+++ b/spec/lib/gitlab/badge/build_spec.rb
@@ -113,7 +113,7 @@ describe Gitlab::Badge::Build do
sha: sha,
ref: branch)
- create(:ci_build, pipeline: pipeline)
+ create(:ci_build, pipeline: pipeline, stage: 'notify')
end
def status_node(data, status)