summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-23 14:50:36 +0000
committerRémy Coutable <remy@rymai.me>2016-09-23 14:50:36 +0000
commitc2b8063fdabbd3c77d086d7dc80890eacebbaf65 (patch)
treeffa89eb3a7da5601dff695d67bd6ec71e9602355 /app
parentbc16d7679b841e30258483013414d79990a1880a (diff)
parentcee66810f88ad7ba622c05529b2163e1d38b1b0f (diff)
downloadgitlab-ce-c2b8063fdabbd3c77d086d7dc80890eacebbaf65.tar.gz
Merge branch 'fix/database-seeds' into 'master'
Fix database seeds for development environment ## What does this MR do? This MR fixes database seeds for development environment and adds CI test for it. ## Why was this MR needed? Database seeds for development environment are often broken, and we are not able to catch that when someone modified `db/fixtures` and forgets to reseed database. Closes #22422 See merge request !6475
Diffstat (limited to 'app')
-rw-r--r--app/models/ci/build.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index cb87b43f6be..522e2264bb8 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -91,7 +91,7 @@ module Ci
sha: build.sha,
ref: build.ref,
tag: build.tag,
- options: build.options[:environment],
+ options: build.options.to_h[:environment],
variables: build.variables)
service.execute(build)
end