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, 46 insertions, 14 deletions

diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
index 7f1e33418de..a0eb2309585 100644
--- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml
+++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
@@ -3,17 +3,49 @@
     %a.close{href: "#"} ×
     %h3 How To Merge
   .modal-body
-    %p
-      %strong Step 1.
-      Checkout target branch and get recent objects from GitLab
-    %pre.dark
-      :preserve
-        git checkout #{@merge_request.target_branch}
-        git fetch origin
-    %p
-      %strong Step 2.
-      Merge source branch into target branch and push changes to GitLab
-    %pre.dark
-      :preserve
-        git merge origin/#{@merge_request.source_branch}
-        git push origin #{@merge_request.target_branch}
+    - if @merge_request.for_fork?
+      - source_remote = @merge_request.source_project.namespace.nil? ? "source" :@merge_request.source_project.namespace.path
+      - target_remote = @merge_request.target_project.namespace.nil? ? "target" :@merge_request.target_project.namespace.path
+      %p
+        %strong Step 1.
+        Checkout target branch and get recent objects from GitLab
+        Assuming remote for  #{@merge_request.target_project.path_with_namespace} is called #{target_remote}
+        remote for  #{@merge_request.source_project.path_with_namespace} is called #{source_remote}
+      %pre.dark
+        :preserve
+          git checkout #{target_remote} #{@merge_request.target_branch}
+          git fetch #{source_remote}
+      %p
+        %strong Step 2.
+        Merge source branch into target branch and push changes to GitLab
+      %pre.dark
+        :preserve
+          git merge #{source_remote}/#{@merge_request.source_branch}
+          git push #{target_remote} #{@merge_request.target_branch}
+    - else
+      %p
+        %strong Step 1.
+        Checkout target branch and get recent objects from GitLab
+      %pre.dark
+        :preserve
+          git checkout #{@merge_request.target_branch}
+          git fetch origin
+      %p
+        %strong Step 2.
+        Merge source branch into target branch and push changes to GitLab
+      %pre.dark
+        :preserve
+          git merge origin/#{@merge_request.source_branch}
+          git push origin #{@merge_request.target_branch}
+
+
+:javascript
+  $(function(){
+    var modal = $('#modal_merge_info').modal({modal: true, show:false});
+    $('.how_to_merge_link').bind("click", function(){
+      modal.show();
+    });
+    $('.modal-header .close').bind("click", function(){
+      modal.hide();
+    })
+  })