Merge Request on forked projects

The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8

1 files changed, 20 insertions, 6 deletions

diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 05ffec066f8..e8e7bf990ac 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -1,13 +1,27 @@
 module MergeRequestsHelper
   def new_mr_path_from_push_event(event)
     new_project_merge_request_path(
-      event.project,
-      merge_request: {
+        event.project,
+        new_mr_from_push_event(event, event.project)
+    )
+  end
+
+  def new_mr_path_for_fork_from_push_event(event)
+    new_project_merge_request_path(
+        event.project,
+        new_mr_from_push_event(event, event.project.forked_from_project)
+    )
+  end
+
+
+  def new_mr_from_push_event(event, target_project)
+    return :merge_request => {
+        source_project_id: event.project.id,
+        target_project_id: target_project.id,
         source_branch: event.branch_name,
-        target_branch: event.project.repository.root_ref,
+        target_branch: target_project.repository.root_ref,
         title: event.branch_name.titleize
-      }
-    )
+    }
   end
 
   def mr_css_classes mr
@@ -18,6 +32,6 @@ module MergeRequestsHelper
   end
 
   def ci_build_details_path merge_request
-    merge_request.project.gitlab_ci_service.build_page(merge_request.last_commit.sha)
+    merge_request.source_project.gitlab_ci_service.build_page(merge_request.last_commit.sha)
   end
 end