diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-30 14:35:33 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-30 14:35:33 +0400 |
| commit | 0d715bcd812ca6c99884e117f28a400669aa8e57 (patch) | |
| tree | 5690fa43c790af40c51441425b9d8be068d4139d /db/fixtures | |
| parent | 4f07a6a99cab8f8ae3ad0a786a6cc9a837955c08 (diff) | |
| parent | 4d373005968b8269a8d2fe56b7776820396127a4 (diff) | |
Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Conflicts:
app/views/projects/commit/show.html.haml
app/views/projects/compare/show.html.haml
app/views/projects/merge_requests/branch_from.js.haml
Diffstat (limited to 'db/fixtures')
| -rw-r--r-- | db/fixtures/development/10_merge_requests.rb | 3 | ||||
| -rw-r--r-- | db/fixtures/test/001_repo.rb | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb index 0a8d67d4461..bf247adb416 100644 --- a/db/fixtures/development/10_merge_requests.rb +++ b/db/fixtures/development/10_merge_requests.rb @@ -23,7 +23,8 @@ Gitlab::Seeder.quiet do id: i, source_branch: branches.first, target_branch: branches.last, - project_id: project.id, + source_project_id: project.id, + target_project_id: project.id, author_id: user_id, assignee_id: user_id, milestone: project.milestones.sample, diff --git a/db/fixtures/test/001_repo.rb b/db/fixtures/test/001_repo.rb index 18fc37cde0c..281e3476df1 100644 --- a/db/fixtures/test/001_repo.rb +++ b/db/fixtures/test/001_repo.rb @@ -19,5 +19,18 @@ FileUtils.cd(REPO_PATH) do # Remove the copy FileUtils.rm(SEED_REPO) end +puts ' done.' +print "Creating seed satellite..." + +SATELLITE_PATH = Rails.root.join('tmp', 'satellite') +# Make directory +FileUtils.mkdir_p(SATELLITE_PATH) +# Clear any potential directory +FileUtils.rm_rf("#{SATELLITE_PATH}/gitlabhq") +# Chdir, clone from the seed +FileUtils.cd(SATELLITE_PATH) do + # Clone the satellite + `git clone --quiet #{REPO_PATH}/gitlabhq #{SATELLITE_PATH}/gitlabhq` +end puts ' done.' |