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

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.'