summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-12-16 12:07:06 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-12-16 12:07:06 +0000
commit404156895cd9f2c646cdf9e56ddc492535517dd5 (patch)
treec533a156dcda69ddc58aa53eaf016200a69d4fae /db
parentc29a184f0fbef64f83cfd1f198ad530ebc9e1a13 (diff)
parent0a5427d7c2679640c816cdfea1ffc30a3e7b4dd8 (diff)
downloadgitlab-ce-404156895cd9f2c646cdf9e56ddc492535517dd5.tar.gz
Merge branch 'change_development_build_fixtures' into 'master'
Made Ci::Builds to have same ref as Ci::Pipeline in dev fixtures See merge request !8110
Diffstat (limited to 'db')
-rw-r--r--db/fixtures/development/14_pipelines.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/fixtures/development/14_pipelines.rb b/db/fixtures/development/14_pipelines.rb
index 08ad3097d34..19e001854d2 100644
--- a/db/fixtures/development/14_pipelines.rb
+++ b/db/fixtures/development/14_pipelines.rb
@@ -115,7 +115,7 @@ class Gitlab::Seeder::Pipelines
def job_attributes(pipeline, opts)
{ name: 'test build', stage: 'test', stage_idx: stage_index(opts[:stage]),
- ref: 'master', tag: false, user: build_user, project: @project, pipeline: pipeline,
+ ref: pipeline.ref, tag: false, user: build_user, project: @project, pipeline: pipeline,
created_at: Time.now, updated_at: Time.now
}.merge(opts)
end