OSDN Git Service

Merge branch 'development_seed_fix' into 'master'
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 24 Jan 2014 11:27:05 +0000 (11:27 +0000)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 24 Jan 2014 11:27:05 +0000 (11:27 +0000)
commit9bb9267482cabaaaed70650929e4521527025494
tree16b28f7f6430a60ff425d4b08fee3631a33ed999
parentd0b87eb05b71ee0fe2ff5385ef6047b032feb3e1
parent5e08f8134ebb695c15bf9c8f1899efdb68c7336f
 Merge branch 'development_seed_fix' into 'master'

Development  Project Seed Data Fix

After this commit https://dev.gitlab.org/gitlab/gitlabhq/commit/1d2bdb4d5880bb1ad39b62c81ff2971aa0cb3798 Contexts were replaced with Services. One context remained in the seed data which means development seeding will fail.

@dzaporozhets Do we want to backport this to 6.5 too?

/cc @jacobvosmaer @sytse