gitlab-qa-bot · 9a900dbb · 9a900dbb · 9a900dbb · 9a900dbb · 9a900dbb
--- a/lib/gitlab/satellite/merge_action.rb
+++ b/lib/gitlab/satellite/merge_action.rb
+     # pushes it back to the repository.
+     # It also removes the source branch if requested in the merge request (and this is permitted by the merge request).
     #
     # Returns false if the merge produced conflicts
-     # Returns false if pushing from the satellite to Gitolite failed or was rejected
+     # Returns false if pushing from the satellite to the repository failed or was rejected
     # Returns true otherwise
     def merge!
       in_locked_and_timed_satellite do |merge_repo|
+         prepare_satellite!(merge_repo)
         if merge_in_satellite!(merge_repo)
           # push merge back to Gitolite
           # will raise CommandFailed when push fails
-           merge_repo.git.push({raise: true, timeout: true}, :origin, merge_request.target_branch)
-
+           merge_repo.git.push(default_options, :origin, merge_request.target_branch)
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/features/project/forked_merge_requests.feature 0 → 100644
+++ b/features/project/forked_merge_requests.feature 0 → 100644
+Feature: Project Forked Merge Requests
+ Background:
+   Given I sign in as a user
+   And I am a member of project "Shop"
+   And I have a project forked off of "Shop" called "Forked Shop"
+
+ @javascript
--- a/features/steps/project/project_fork.rb
+++ b/features/steps/project/project_fork.rb
 step 'I should see the forked project page' do
--- a/features/steps/project/project_forked_merge_requests.rb 0 → 100644
+++ b/features/steps/project/project_forked_merge_requests.rb 0 → 100644
+class ProjectForkedMergeRequests < Spinach::FeatureSteps
+ include SharedAuthentication
+ include SharedProject
+ include SharedNote
+ include SharedPaths
+
+ Given 'I am a member of project "Shop"' do
+   @project = Project.find_by_name "Shop"
--- a/features/steps/project/project_merge_requests.rb
+++ b/features/steps/project/project_merge_requests.rb
--- a/lib/gitlab/satellite/merge_action.rb
+++ b/lib/gitlab/satellite/merge_action.rb
--- a/spec/factories.rb
+++ b/spec/factories.rb
--- a/spec/factories.rb
+++ b/spec/factories.rb
--- a/spec/factories_spec.rb
+++ b/spec/factories_spec.rb
 require 'spec_helper'

 INVALID_FACTORIES = [
-    :key_with_a_space_in_the_middle,
-    :invalid_key,
+ :key_with_a_space_in_the_middle,
+ :invalid_key,
 ]

 FactoryGirl.factories.map(&:name).each do |factory_name|
--- a/app/views/notify/merged_merge_request_email.text.haml
+++ b/app/views/notify/merged_merge_request_email.text.haml
 = "Merge Request #{@merge_request.id} was merged"

-Merge Request Url: #{project_merge_request_url(@merge_request.project, @merge_request)}
+Merge Request Url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}

-Branches: #{@merge_request.source_branch} - #{@merge_request.target_branch}
+= merge_path_description(@merge_request, 'to')
--- a/app/views/notify/new_merge_request_email.html.haml
+++ b/app/views/notify/new_merge_request_email.html.haml
 %p
 = "New Merge Request !#{@merge_request.id}"
 %p
- = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request)
+ = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
 %p
- Branches: #{@merge_request.source_branch} &rarr; #{@merge_request.target_branch}
+ != merge_path_description(@merge_request, '&rarr;')
--- a/app/views/notify/closed_merge_request_email.text.haml
+++ b/app/views/notify/closed_merge_request_email.text.haml
 = "Merge Request #{@merge_request.id} was closed by #{@updated_by.name}"

-Merge Request url: #{project_merge_request_url(@merge_request.project, @merge_request)}
+Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}

-Branches: #{@merge_request.source_branch} - #{@merge_request.target_branch}
+= merge_path_description(@merge_request, 'to')
--- a/app/contexts/filter_context.rb
+++ b/app/contexts/filter_context.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
+#  merge_status   :string(255)
 #

 require Rails.root.join("app/models/commit")
 require Rails.root.join("lib/static_model")

 class MergeRequest < ActiveRecord::Base
+
 include Issuable

- attr_accessible :title, :assignee_id, :target_branch, :source_branch, :milestone_id,
-                 :author_id_of_changes, :state_event
+ belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
+ belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
+
+ attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :author_id_of_changes, :state_event
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
--- a/app/observers/merge_request_observer.rb
+++ b/app/observers/merge_request_observer.rb

 def after_reopen(merge_request, transition)
-   Note.create_status_change_note(merge_request, current_user, merge_request.state)
+   create_event(merge_request, Event::REOPENED)
+   Note.create_status_change_note(merge_request, merge_request.target_project, current_user, merge_request.state)
 end

 def after_update(merge_request)
   notification.reassigned_merge_request(merge_request, current_user) if merge_request.is_being_reassigned?
 end
+
+ def create_event(record, status)
+   Event.create(
+     project: record.target_project,
+     target_id: record.id,
+     target_type: record.class.name,
--- a/app/observers/merge_request_observer.rb
+++ b/app/observers/merge_request_observer.rb
-   Note.create_status_change_note(merge_request, current_user, merge_request.state)
+   create_event(merge_request, Event::CLOSED)
+   Note.create_status_change_note(merge_request, merge_request.target_project, current_user, merge_request.state)

   notification.close_mr(merge_request, current_user)
 end

 def after_merge(merge_request, transition)
   notification.merge_mr(merge_request)
+   # Since MR can be merged via sidekiq
+   # to prevent event duplication do this check
+   return true if merge_request.merge_event
+
+   Event.create(
+     project: merge_request.target_project,
+     target_id: merge_request.id,
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
--- a/app/observers/merge_request_observer.rb
+++ b/app/observers/merge_request_observer.rb
-class MergeRequestObserver < BaseObserver
+class MergeRequestObserver < ActivityObserver
+ observe :merge_request
+
 def after_create(merge_request)
+   if merge_request.author_id
+     create_event(merge_request, Event.determine_action(merge_request))
+   end
+
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
   .title
     %i.icon-calendar
     %span= day.stamp("28 Aug, 2010")
-
     .pull-right
       %small= pluralize(commits.count, 'commit')
-   %ul.well-list= render commits
+   %ul.well-list= render commits, project: @project
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/db/migrate/20130419190306_allow_merges_for_forks.rb 0 → 100644
+++ b/db/migrate/20130419190306_allow_merges_for_forks.rb 0 → 100644
+class AllowMergesForForks < ActiveRecord::Migration
+
+ def self.up
+   add_column :merge_requests, :target_project_id, :integer, :null => false
+   MergeRequest.update_all("target_project_id = project_id")
--- a/features/steps/project/project_forked_merge_requests.rb 0 → 100644
+++ b/features/steps/project/project_forked_merge_requests.rb 0 → 100644
+   find("#merge_request_target_branch").value.should have_content "master"
+   find("#merge_request_title").value.should == "New Design"
+   verify_commit_link(".mr_target_commit",@project)
+   verify_commit_link(".mr_source_commit",@forked_project)
+ end
+
+ And 'I update the merge request title' do
+   fill_in "merge_request_title", with: "An Edited Forked Merge Request"
+ end
+
+ And 'I save the merge request' do
+   click_button "Save changes"
+ end
+
+ Then 'I should see the edited merge request' do
+   page.should have_content "An Edited Forked Merge Request"
--- a/features/steps/project/project_forked_merge_requests.rb 0 → 100644
+++ b/features/steps/project/project_forked_merge_requests.rb 0 → 100644
+   @project.merge_requests.size.should >= 1
+   @merge_request = @project.merge_requests.last
+   current_path.should == project_merge_request_path(@project, @merge_request)
+   @merge_request.source_project.should == @forked_project
+   @merge_request.source_branch.should == "master"
+   @merge_request.target_branch.should == "stable"
+   page.should have_content @forked_project.path_with_namespace
+   page.should have_content @project.path_with_namespace
+   page.should have_content @merge_request.source_branch
+   page.should have_content @merge_request.target_branch
+ end
+
+ Then 'I should see last push widget' do
+   page.should have_content "You pushed to new_design"
+   page.should have_link "Create Merge Request"
+ end
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
+#  st_diffs       :text(2147483647)
+#  milestone_id   :integer
+#  state          :string(255)
+#  merge_status   :string(255)
 #

 require Rails.root.join("app/models/commit")
 require Rails.root.join("lib/static_model")

 class MergeRequest < ActiveRecord::Base
+
 include Issuable

- attr_accessible :title, :assignee_id, :target_branch, :source_branch, :milestone_id,
-                 :author_id_of_changes, :state_event
+ belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
--- a/spec/factories.rb
+++ b/spec/factories.rb
     source_branch "stable" # pretend bcf03b5d
     st_commits do
       [
-         project.repository.commit('bcf03b5d').to_hash,
-         project.repository.commit('bcf03b5d~1').to_hash,
-         project.repository.commit('bcf03b5d~2').to_hash
+         source_project.repository.commit('bcf03b5d').to_hash,
+         source_project.repository.commit('bcf03b5d~1').to_hash,
+         source_project.repository.commit('bcf03b5d~2').to_hash
--- a/spec/lib/gitlab/satellite/action_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/satellite/action_spec.rb 0 → 100644
+
+     #verify it's clean
+     heads = repo.heads.map(&:name)
+     heads.size.should == 1
+     heads.include?(Gitlab::Satellite::Satellite::PARKING_BRANCH).should == true
+     remotes = repo.git.remote().split(' ')
+     remotes.size.should == 1
+     remotes.include?('origin').should == true
+     repo.config['user.name'].should ==user.name
+     repo.config['user.email'].should ==user.email
+   end
+ end
+
+ describe '#in_locked_and_timed_satellite' do
+
+   it 'should make use of a lockfile' do
--- a/spec/lib/gitlab/satellite/action_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/satellite/action_spec.rb 0 → 100644
+require 'spec_helper'
+
+describe 'Gitlab::Satellite::Action' do
+ let(:project) { create(:project_with_code) }
+ let(:user) { create(:user) }
+
+ describe '#prepare_satellite!' do
+
+   it 'create a repository with a parking branch and one remote: origin' do
--- a/spec/lib/gitlab/satellite/action_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/satellite/action_spec.rb 0 → 100644
+require 'spec_helper'
+
+describe 'Gitlab::Satellite::Action' do
+ let(:project) { create(:project_with_code) }
+ let(:user) { create(:user) }
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
 end

 def unmerged_diffs
-   project.repository.diffs_between(source_branch, target_branch)
+   if for_fork?
+     diffs = Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite
+   else
+     diffs = target_project.repository.diffs_between(source_branch, target_branch)
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
 def commit_author
   @commit_author ||=
     project.users.find_by_email(noteable.author_email) ||
-     project.users.find_by_name(noteable.author_name)
+       project.users.find_by_name(noteable.author_name)
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
--- a/app/views/notify/closed_merge_request_email.html.haml
+++ b/app/views/notify/closed_merge_request_email.html.haml
 %p
 = "Merge Request #{@merge_request.id} was closed by #{@updated_by.name}"
 %p
- = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request)
+ = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
 %p
- Branches: #{@merge_request.source_branch} &rarr; #{@merge_request.target_branch}
+ != merge_path_description(@merge_request, '&rarr;')
--- a/app/views/notify/closed_merge_request_email.text.haml
+++ b/app/views/notify/closed_merge_request_email.text.haml
 = "Merge Request #{@merge_request.id} was closed by #{@updated_by.name}"

-Merge Request url: #{project_merge_request_url(@merge_request.project, @merge_request)}
+Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}

-Branches: #{@merge_request.source_branch} - #{@merge_request.target_branch}
+= merge_path_description(@merge_request, 'to')
--- a/app/views/notify/merged_merge_request_email.html.haml
+++ b/app/views/notify/merged_merge_request_email.html.haml
 %p
 = "Merge Request #{@merge_request.id} was merged"
 %p
- = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request)
+ = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
 %p
- Branches: #{@merge_request.source_branch} &rarr; #{@merge_request.target_branch}
+ != merge_path_description(@merge_request, '&rarr;')
--- a/app/views/notify/merged_merge_request_email.text.haml
+++ b/app/views/notify/merged_merge_request_email.text.haml
 = "Merge Request #{@merge_request.id} was merged"

-Merge Request Url: #{project_merge_request_url(@merge_request.project, @merge_request)}
+Merge Request Url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}

-Branches: #{@merge_request.source_branch} - #{@merge_request.target_branch}
+= merge_path_description(@merge_request, 'to')
--- a/app/views/notify/new_merge_request_email.html.haml
+++ b/app/views/notify/new_merge_request_email.html.haml
 %p
 = "New Merge Request !#{@merge_request.id}"
 %p
- = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request)
+ = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
 %p
- Branches: #{@merge_request.source_branch} &rarr; #{@merge_request.target_branch}
+ != merge_path_description(@merge_request, '&rarr;')
--- a/app/views/notify/new_merge_request_email.text.erb
+++ b/app/views/notify/new_merge_request_email.text.erb
 New Merge Request <%= @merge_request.id %>

-<%= url_for(project_merge_request_url(@merge_request.project, @merge_request)) %>
-         
+<%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>

-Branches: <%= @merge_request.source_branch %> to <%= @merge_request.target_branch %>
+<%= merge_path_description(@merge_request, 'to') %>
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
 %li{ class: mr_css_classes(merge_request) }
 .merge-request-title
   %span.light= "##{merge_request.id}"
-   = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.project, merge_request), class: "row_title"
+   = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
   - if merge_request.merged?
     %small.pull-right
       %i.icon-ok
       = "MERGED"
   - else
     %span.pull-right
-       %i.icon-angle-right
-       = merge_request.target_branch
+       - if merge_request.for_fork?
+         = "#{merge_request.source_project.path_with_namespace}/#{merge_request.source_branch}"
+         %i.icon-angle-right
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
 %h3.page-title
 = "Merge Request ##{@merge_request.id}:"
 &nbsp;
--- a/app/views/projects/notes/_discussion.html.haml
+++ b/app/views/projects/notes/_discussion.html.haml
--- a/app/views/search/_result.html.haml
+++ b/app/views/search/_result.html.haml
   - @merge_requests.each do |merge_request|
     %li
       merge request:
-       = link_to [merge_request.project, merge_request] do
+       = link_to [merge_request.target_project, merge_request] do
         %span ##{merge_request.id}
         %strong.term
           = truncate merge_request.title, length: 50
-       %span.light (#{merge_request.project.name_with_namespace})
--- a/features/project/forked_merge_requests.feature 0 → 100644
+++ b/features/project/forked_merge_requests.feature 0 → 100644
+ Scenario: I can visit the target projects commit for a forked merge request
+   Given I visit project "Forked Shop" merge requests page
+   And I click link "New Merge Request"
+   And I fill out a "Merge Request On Forked Project" merge request
+   And I follow the target commit link
+   Then I should see the commit under the forked from project
+
+ @javascript
+ Scenario: I submit new unassigned merge request to a forked project
+   Given I visit project "Forked Shop" merge requests page
+   And I click link "New Merge Request"
+   And I fill out a "Merge Request On Forked Project" merge request
+   And I submit the merge request
+   Then I should see merge request "Merge Request On Forked Project"
+
+ @javascript
--- a/features/project/forked_merge_requests.feature 0 → 100644
+++ b/features/project/forked_merge_requests.feature 0 → 100644
+   Then I should see last push widget
+   And I click "Create Merge Request on fork" link
+   Then I see prefilled new Merge Request page for the forked project
+
+ @javascript
+ Scenario: I can edit a forked merge request
+   Given I visit project "Forked Shop" merge requests page
+   And I click link "New Merge Request"
+   And I fill out a "Merge Request On Forked Project" merge request
+   And I submit the merge request
+   And I should see merge request "Merge Request On Forked Project"
+   And I click link edit "Merge Request On Forked Project"
+   Then I see the edit page prefilled for "Merge Request On Forked Project"
+   And I update the merge request title
+   And I save the merge request
+   Then I should see the edited merge request
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
--- a/lib/gitlab/satellite/action.rb
+++ b/lib/gitlab/satellite/action.rb
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
--- a/lib/gitlab/satellite/action.rb
+++ b/lib/gitlab/satellite/action.rb
     ensure
       Gitlab::ShellEnv.reset_env
     end

-     # * Clears the satellite
-     # * Updates the satellite from Gitolite
+     # * Recreates the satellite
     # * Sets up Git variables for the user
     #
     # Note: use this within #in_locked_and_timed_satellite
     def prepare_satellite!(repo)
       project.satellite.clear_and_update!

-       repo.git.config({}, "user.name", user.name)
-       repo.git.config({}, "user.email", user.email)
+       repo.config['user.name'] = user.name
--- a/lib/gitlab/satellite/action.rb
+++ b/lib/gitlab/satellite/action.rb
       Gitlab::ShellEnv.reset_env
     end

-     # * Clears the satellite
-     # * Updates the satellite from Gitolite
+     # * Recreates the satellite
     # * Sets up Git variables for the user
     #
     # Note: use this within #in_locked_and_timed_satellite
     def prepare_satellite!(repo)
       project.satellite.clear_and_update!

-       repo.git.config({}, "user.name", user.name)
-       repo.git.config({}, "user.email", user.email)
+       repo.config['user.name'] = user.name
+       repo.config['user.email'] = user.email
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
 module Gitlab
- class SatelliteNotExistError < StandardError; end
+ class SatelliteNotExistError < StandardError;  end
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
     def clear_and_update!
       raise_no_satellite unless exists?

+       File.exists? path
+       @repo = nil
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
+     def remove_remotes!
+       remotes = repo.git.remote.split(' ')
+       remotes.delete('origin')
+       remotes.each { |name| repo.git.remote(default_options,'rm', name)}
     end

     # Updates the satellite from Gitolite
     #
     # Note: this will only update remote branches (i.e. origin/*)
     def update_from_source!
-       repo.git.fetch({timeout: true}, :origin)
+       repo.git.fetch(default_options, :origin)
+     end
+
+     def default_options(options = {})
+       {raise: true, timeout: true}.merge(options)
--- a/spec/factories_spec.rb
+++ b/spec/factories_spec.rb
--- a/spec/features/security/project_access_spec.rb
+++ b/spec/features/security/project_access_spec.rb
--- a/spec/lib/gitlab/satellite/merge_action_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/satellite/merge_action_spec.rb 0 → 100644
+     it 'should raise exception -- not expected to be used by non forks' do
+       merge_request.target_branch = @one_after_stable[0]
+       merge_request.source_branch = @master[0]
+       expect {Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).commits_between}.to raise_error
+
+       merge_request.target_branch = @wiki_branch[0]
+       merge_request.source_branch = @master[0]
+       expect {Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).commits_between}.to raise_error
+     end
+   end
+ end
+
+ describe '#format_patch' do
+   let(:target_commit) {['artiom-config-examples','9edbac5ac88ffa1ec9dad0097226b51e29ebc9ac']}
+   let(:source_commit) {['metior', '313d96e42b313a0af5ab50fa233bf43e27118b3f']}
+
--- a/spec/lib/gitlab/satellite/merge_action_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/satellite/merge_action_spec.rb 0 → 100644
+
+     (patch.include? 'e74fae147abc7d2ffbf93d363dbbe45b87751f6f').should be_false
+     (patch.include? '86f76b11c670425bbab465087f25172378d76147').should be_false
+   end
+
+   context 'on fork' do
+     it 'should build a format patch' do
+       merge_request_fork.target_branch = target_commit[0]
+       merge_request_fork.source_branch = source_commit[0]
+       patch = Gitlab::Satellite::MergeAction.new(merge_request_fork.author, merge_request_fork).format_patch
+       verify_content(patch)
+     end
+   end
+
+   context 'between branches' do
+     it 'should build a format patch' do
--- a/spec/lib/gitlab/satellite/merge_action_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/satellite/merge_action_spec.rb 0 → 100644
+       merge_request_fork.source_branch = @master[0]
+       diff = Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request_fork).diff_in_satellite
+
+       is_a_matching_diff(diff, diffs)
+     end
+   end
+
+   context 'between branches' do
+     it 'should get proper diffs' do
+       merge_request.target_branch = @close_commit1[0]
+       merge_request.source_branch = @master[0]
+       expect{Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).diffs_between_satellite}.to raise_error
+     end
+   end
+ end
+
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
+
+ describe '#for_fork?' do
+   it 'returns true if the merge request is for a fork' do
+     subject.source_project = create(:source_project)
+     subject.target_project = create(:target_project)
+
+     subject.for_fork?.should be_true
+   end
+   it 'returns false if is not for a fork' do
+     subject.source_project = create(:source_project)
+     subject.target_project = subject.source_project
+     subject.for_fork?.should be_false
+   end
+ end
+
+ describe '#allow_source_branch_removal?' do
--- a/spec/observers/merge_request_observer_spec.rb
+++ b/spec/observers/merge_request_observer_spec.rb
-       Note.should_receive(:create_status_change_note).with(closed_assigned_mr, some_user, 'reopened')
+       Note.should_receive(:create_status_change_note).with(closed_assigned_mr, closed_assigned_mr.target_project, some_user, 'reopened')

       closed_assigned_mr.reopen
     end

     it 'notification is delivered only to author if the merge request is being reopened' do
-       Note.should_receive(:create_status_change_note).with(closed_unassigned_mr, some_user, 'reopened')
+       Note.should_receive(:create_status_change_note).with(closed_unassigned_mr, closed_unassigned_mr.target_project, some_user, 'reopened')

       closed_unassigned_mr.reopen
     end
   end
 end
+
+ describe "Merge Request created" do
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
 describe API::API do
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
   Gitlab::Satellite::Satellite.any_instance.stub(
     exists?: true,
     destroy: true,
-     create: true
+     create: true,
+     lock_files_dir: repos_path
--- a/app/contexts/filter_context.rb
+++ b/app/contexts/filter_context.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
--- a/app/observers/merge_request_observer.rb
+++ b/app/observers/merge_request_observer.rb

 def after_reopen(merge_request, transition)
-   Note.create_status_change_note(merge_request, current_user, merge_request.state)
+   create_event(merge_request, Event::REOPENED)
+   Note.create_status_change_note(merge_request, merge_request.target_project, current_user, merge_request.state)
 end

 def after_update(merge_request)
   notification.reassigned_merge_request(merge_request, current_user) if merge_request.is_being_reassigned?
 end
+
+ def create_event(record, status)
+   Event.create(
+     project: record.target_project,
+     target_id: record.id,
+     target_type: record.class.name,
--- a/app/observers/merge_request_observer.rb
+++ b/app/observers/merge_request_observer.rb
-   Note.create_status_change_note(merge_request, current_user, merge_request.state)
+   create_event(merge_request, Event::CLOSED)
+   Note.create_status_change_note(merge_request, merge_request.target_project, current_user, merge_request.state)

   notification.close_mr(merge_request, current_user)
 end

 def after_merge(merge_request, transition)
   notification.merge_mr(merge_request)
+   # Since MR can be merged via sidekiq
+   # to prevent event duplication do this check
+   return true if merge_request.merge_event
+
+   Event.create(
+     project: merge_request.target_project,
+     target_id: merge_request.id,
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
--- a/app/observers/merge_request_observer.rb
+++ b/app/observers/merge_request_observer.rb
-class MergeRequestObserver < BaseObserver
+class MergeRequestObserver < ActivityObserver
+ observe :merge_request
+
 def after_create(merge_request)
+   if merge_request.author_id
+     create_event(merge_request, Event.determine_action(merge_request))
+   end
+
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
   .title
     %i.icon-calendar
     %span= day.stamp("28 Aug, 2010")
-
     .pull-right
       %small= pluralize(commits.count, 'commit')
-   %ul.well-list= render commits
+   %ul.well-list= render commits, project: @project
--- a/db/migrate/20130419190306_allow_merges_for_forks.rb 0 → 100644
+++ b/db/migrate/20130419190306_allow_merges_for_forks.rb 0 → 100644
+class AllowMergesForForks < ActiveRecord::Migration
+
+ def self.up
+   add_column :merge_requests, :target_project_id, :integer, :null => false
+   MergeRequest.update_all("target_project_id = project_id")
--- a/features/steps/project/project_forked_merge_requests.rb 0 → 100644
+++ b/features/steps/project/project_forked_merge_requests.rb 0 → 100644
+   find("#merge_request_target_branch").value.should have_content "master"
+   find("#merge_request_title").value.should == "New Design"
+   verify_commit_link(".mr_target_commit",@project)
+   verify_commit_link(".mr_source_commit",@forked_project)
+ end
+
+ And 'I update the merge request title' do
+   fill_in "merge_request_title", with: "An Edited Forked Merge Request"
+ end
+
+ And 'I save the merge request' do
+   click_button "Save changes"
+ end
+
+ Then 'I should see the edited merge request' do
+   page.should have_content "An Edited Forked Merge Request"
--- a/features/steps/project/project_forked_merge_requests.rb 0 → 100644
+++ b/features/steps/project/project_forked_merge_requests.rb 0 → 100644
+   @project.merge_requests.size.should >= 1
+   @merge_request = @project.merge_requests.last
+   current_path.should == project_merge_request_path(@project, @merge_request)
+   @merge_request.source_project.should == @forked_project
+   @merge_request.source_branch.should == "master"
+   @merge_request.target_branch.should == "stable"
+   page.should have_content @forked_project.path_with_namespace
+   page.should have_content @project.path_with_namespace
+   page.should have_content @merge_request.source_branch
+   page.should have_content @merge_request.target_branch
+ end
+
+ Then 'I should see last push widget' do
+   page.should have_content "You pushed to new_design"
+   page.should have_link "Create Merge Request"
+ end
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
+#  st_diffs       :text(2147483647)
+#  milestone_id   :integer
+#  state          :string(255)
+#  merge_status   :string(255)
 #

 require Rails.root.join("app/models/commit")
 require Rails.root.join("lib/static_model")

 class MergeRequest < ActiveRecord::Base
+
 include Issuable

- attr_accessible :title, :assignee_id, :target_branch, :source_branch, :milestone_id,
-                 :author_id_of_changes, :state_event
+ belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
--- a/spec/factories.rb
+++ b/spec/factories.rb
     source_branch "stable" # pretend bcf03b5d
     st_commits do
       [
-         project.repository.commit('bcf03b5d').to_hash,
-         project.repository.commit('bcf03b5d~1').to_hash,
-         project.repository.commit('bcf03b5d~2').to_hash
+         source_project.repository.commit('bcf03b5d').to_hash,
+         source_project.repository.commit('bcf03b5d~1').to_hash,
+         source_project.repository.commit('bcf03b5d~2').to_hash
--- a/spec/lib/gitlab/satellite/action_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/satellite/action_spec.rb 0 → 100644
+
+     #verify it's clean
+     heads = repo.heads.map(&:name)
+     heads.size.should == 1
+     heads.include?(Gitlab::Satellite::Satellite::PARKING_BRANCH).should == true
+     remotes = repo.git.remote().split(' ')
+     remotes.size.should == 1
+     remotes.include?('origin').should == true
+     repo.config['user.name'].should ==user.name
+     repo.config['user.email'].should ==user.email
+   end
+ end
+
+ describe '#in_locked_and_timed_satellite' do
+
+   it 'should make use of a lockfile' do
--- a/spec/lib/gitlab/satellite/action_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/satellite/action_spec.rb 0 → 100644
+require 'spec_helper'
+
+describe 'Gitlab::Satellite::Action' do
+ let(:project) { create(:project_with_code) }
+ let(:user) { create(:user) }
+
+ describe '#prepare_satellite!' do
+
+   it 'create a repository with a parking branch and one remote: origin' do
--- a/spec/lib/gitlab/satellite/action_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/satellite/action_spec.rb 0 → 100644
+require 'spec_helper'
+
+describe 'Gitlab::Satellite::Action' do
+ let(:project) { create(:project_with_code) }
+ let(:user) { create(:user) }
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
 end

 def unmerged_diffs
-   project.repository.diffs_between(source_branch, target_branch)
+   if for_fork?
+     diffs = Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite
+   else
+     diffs = target_project.repository.diffs_between(source_branch, target_branch)
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
 def commit_author
   @commit_author ||=
     project.users.find_by_email(noteable.author_email) ||
-     project.users.find_by_name(noteable.author_name)
+       project.users.find_by_name(noteable.author_name)
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
 %li{ class: mr_css_classes(merge_request) }
 .merge-request-title
   %span.light= "##{merge_request.id}"
-   = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.project, merge_request), class: "row_title"
+   = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
   - if merge_request.merged?
     %small.pull-right
       %i.icon-ok
       = "MERGED"
   - else
     %span.pull-right
-       %i.icon-angle-right
-       = merge_request.target_branch
+       - if merge_request.for_fork?
+         = "#{merge_request.source_project.path_with_namespace}/#{merge_request.source_branch}"
+         %i.icon-angle-right
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
 %h3.page-title
 = "Merge Request ##{@merge_request.id}:"
 &nbsp;
--- a/app/views/search/_result.html.haml
+++ b/app/views/search/_result.html.haml
   - @merge_requests.each do |merge_request|
     %li
       merge request:
-       = link_to [merge_request.project, merge_request] do
+       = link_to [merge_request.target_project, merge_request] do
         %span ##{merge_request.id}
         %strong.term
           = truncate merge_request.title, length: 50
-       %span.light (#{merge_request.project.name_with_namespace})
--- a/features/project/forked_merge_requests.feature 0 → 100644
+++ b/features/project/forked_merge_requests.feature 0 → 100644
+ Scenario: I can visit the target projects commit for a forked merge request
+   Given I visit project "Forked Shop" merge requests page
+   And I click link "New Merge Request"
+   And I fill out a "Merge Request On Forked Project" merge request
+   And I follow the target commit link
+   Then I should see the commit under the forked from project
+
+ @javascript
+ Scenario: I submit new unassigned merge request to a forked project
+   Given I visit project "Forked Shop" merge requests page
+   And I click link "New Merge Request"
+   And I fill out a "Merge Request On Forked Project" merge request
+   And I submit the merge request
+   Then I should see merge request "Merge Request On Forked Project"
+
+ @javascript
--- a/features/project/forked_merge_requests.feature 0 → 100644
+++ b/features/project/forked_merge_requests.feature 0 → 100644
+   Then I should see last push widget
+   And I click "Create Merge Request on fork" link
+   Then I see prefilled new Merge Request page for the forked project
+
+ @javascript
+ Scenario: I can edit a forked merge request
+   Given I visit project "Forked Shop" merge requests page
+   And I click link "New Merge Request"
+   And I fill out a "Merge Request On Forked Project" merge request
+   And I submit the merge request
+   And I should see merge request "Merge Request On Forked Project"
+   And I click link edit "Merge Request On Forked Project"
+   Then I see the edit page prefilled for "Merge Request On Forked Project"
+   And I update the merge request title
+   And I save the merge request
+   Then I should see the edited merge request
--- a/lib/gitlab/satellite/action.rb
+++ b/lib/gitlab/satellite/action.rb
--- a/lib/gitlab/satellite/action.rb
+++ b/lib/gitlab/satellite/action.rb
     ensure
       Gitlab::ShellEnv.reset_env
     end

-     # * Clears the satellite
-     # * Updates the satellite from Gitolite
+     # * Recreates the satellite
     # * Sets up Git variables for the user
     #
     # Note: use this within #in_locked_and_timed_satellite
     def prepare_satellite!(repo)
       project.satellite.clear_and_update!

-       repo.git.config({}, "user.name", user.name)
-       repo.git.config({}, "user.email", user.email)
+       repo.config['user.name'] = user.name
--- a/lib/gitlab/satellite/action.rb
+++ b/lib/gitlab/satellite/action.rb
       Gitlab::ShellEnv.reset_env
     end

-     # * Clears the satellite
-     # * Updates the satellite from Gitolite
+     # * Recreates the satellite
     # * Sets up Git variables for the user
     #
     # Note: use this within #in_locked_and_timed_satellite
     def prepare_satellite!(repo)
       project.satellite.clear_and_update!

-       repo.git.config({}, "user.name", user.name)
-       repo.git.config({}, "user.email", user.email)
+       repo.config['user.name'] = user.name
+       repo.config['user.email'] = user.email
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
 module Gitlab
- class SatelliteNotExistError < StandardError; end
+ class SatelliteNotExistError < StandardError;  end
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
     def clear_and_update!
       raise_no_satellite unless exists?

+       File.exists? path
+       @repo = nil
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
+     def remove_remotes!
+       remotes = repo.git.remote.split(' ')
+       remotes.delete('origin')
+       remotes.each { |name| repo.git.remote(default_options,'rm', name)}
     end

     # Updates the satellite from Gitolite
     #
     # Note: this will only update remote branches (i.e. origin/*)
     def update_from_source!
-       repo.git.fetch({timeout: true}, :origin)
+       repo.git.fetch(default_options, :origin)
+     end
+
+     def default_options(options = {})
+       {raise: true, timeout: true}.merge(options)
--- a/spec/factories_spec.rb
+++ b/spec/factories_spec.rb
--- a/spec/features/security/project_access_spec.rb
+++ b/spec/features/security/project_access_spec.rb
--- a/spec/lib/gitlab/satellite/merge_action_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/satellite/merge_action_spec.rb 0 → 100644
+     it 'should raise exception -- not expected to be used by non forks' do
+       merge_request.target_branch = @one_after_stable[0]
+       merge_request.source_branch = @master[0]
+       expect {Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).commits_between}.to raise_error
+
+       merge_request.target_branch = @wiki_branch[0]
+       merge_request.source_branch = @master[0]
+       expect {Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).commits_between}.to raise_error
+     end
+   end
+ end
+
+ describe '#format_patch' do
+   let(:target_commit) {['artiom-config-examples','9edbac5ac88ffa1ec9dad0097226b51e29ebc9ac']}
+   let(:source_commit) {['metior', '313d96e42b313a0af5ab50fa233bf43e27118b3f']}
+
--- a/spec/lib/gitlab/satellite/merge_action_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/satellite/merge_action_spec.rb 0 → 100644
+
+     (patch.include? 'e74fae147abc7d2ffbf93d363dbbe45b87751f6f').should be_false
+     (patch.include? '86f76b11c670425bbab465087f25172378d76147').should be_false
+   end
+
+   context 'on fork' do
+     it 'should build a format patch' do
+       merge_request_fork.target_branch = target_commit[0]
+       merge_request_fork.source_branch = source_commit[0]
+       patch = Gitlab::Satellite::MergeAction.new(merge_request_fork.author, merge_request_fork).format_patch
+       verify_content(patch)
+     end
+   end
+
+   context 'between branches' do
+     it 'should build a format patch' do
--- a/spec/lib/gitlab/satellite/merge_action_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/satellite/merge_action_spec.rb 0 → 100644
+       merge_request_fork.source_branch = @master[0]
+       diff = Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request_fork).diff_in_satellite
+
+       is_a_matching_diff(diff, diffs)
+     end
+   end
+
+   context 'between branches' do
+     it 'should get proper diffs' do
+       merge_request.target_branch = @close_commit1[0]
+       merge_request.source_branch = @master[0]
+       expect{Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).diffs_between_satellite}.to raise_error
+     end
+   end
+ end
+
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
+
+ describe '#for_fork?' do
+   it 'returns true if the merge request is for a fork' do
+     subject.source_project = create(:source_project)
+     subject.target_project = create(:target_project)
+
+     subject.for_fork?.should be_true
+   end
+   it 'returns false if is not for a fork' do
+     subject.source_project = create(:source_project)
+     subject.target_project = subject.source_project
+     subject.for_fork?.should be_false
+   end
+ end
+
+ describe '#allow_source_branch_removal?' do
--- a/spec/observers/merge_request_observer_spec.rb
+++ b/spec/observers/merge_request_observer_spec.rb
-       Note.should_receive(:create_status_change_note).with(closed_assigned_mr, some_user, 'reopened')
+       Note.should_receive(:create_status_change_note).with(closed_assigned_mr, closed_assigned_mr.target_project, some_user, 'reopened')

       closed_assigned_mr.reopen
     end

     it 'notification is delivered only to author if the merge request is being reopened' do
-       Note.should_receive(:create_status_change_note).with(closed_unassigned_mr, some_user, 'reopened')
+       Note.should_receive(:create_status_change_note).with(closed_unassigned_mr, closed_unassigned_mr.target_project, some_user, 'reopened')

       closed_unassigned_mr.reopen
     end
   end
 end
+
+ describe "Merge Request created" do
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
 describe API::API do
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
   Gitlab::Satellite::Satellite.any_instance.stub(
     exists?: true,
     destroy: true,
-     create: true
+     create: true,
+     lock_files_dir: repos_path
--- a/lib/gitlab/satellite/merge_action.rb
+++ b/lib/gitlab/satellite/merge_action.rb
+       end
+     rescue Grit::Git::CommandFailed => ex
+       handle_exception(ex)
+     end
+
+     # Retrieve an array of commits between the source and the target
+     def commits_between
+       in_locked_and_timed_satellite do |merge_repo|
+         prepare_satellite!(merge_repo)
+         update_satellite_source_and_target!(merge_repo)
+         if (merge_request.for_fork?)
+           commits = merge_repo.commits_between("origin/#{merge_request.target_branch}", "source/#{merge_request.source_branch}")
+         else
+           raise "Attempt to determine commits between for a non forked merge request in satellite MergeRequest.id:[#{merge_request.id}]"
+         end
+         commits = commits.map { |commit| Gitlab::Git::Commit.new(commit, nil) }
--- a/lib/gitlab/satellite/merge_action.rb
+++ b/lib/gitlab/satellite/merge_action.rb
+
+     # Only show what is new in the source branch compared to the target branch, not the other way around.
+     # The line below with merge_base is equivalent to diff with three dots (git diff branch1...branch2)
+     # From the git documentation: "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B"
+     def diffs_between_satellite
+       in_locked_and_timed_satellite do |merge_repo|
+         prepare_satellite!(merge_repo)
+         update_satellite_source_and_target!(merge_repo)
+         if merge_request.for_fork?
+           common_commit = merge_repo.git.native(:merge_base, default_options, ["origin/#{merge_request.target_branch}", "source/#{merge_request.source_branch}"]).strip
+           #this method doesn't take default options
+           diffs = merge_repo.diff(common_commit, "source/#{merge_request.source_branch}")
+         else
+           raise "Attempt to determine diffs between for a non forked merge request in satellite MergeRequest.id:[#{merge_request.id}]"
+         end
+         diffs = diffs.map { |diff| Gitlab::Git::Diff.new(diff) }
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/lib/gitlab/satellite/merge_action.rb
+++ b/lib/gitlab/satellite/merge_action.rb
+         diffs = diffs.map { |diff| Gitlab::Git::Diff.new(diff) }
+         return diffs
+       end
+     rescue Grit::Git::CommandFailed => ex
+       handle_exception(ex)
+     end
+
+     # Get commit as an email patch
+     def format_patch
+       in_locked_and_timed_satellite do |merge_repo|
+         prepare_satellite!(merge_repo)
+         update_satellite_source_and_target!(merge_repo)
+         if (merge_request.for_fork?)
+           patch = merge_repo.git.format_patch(default_options({stdout: true}), "origin/#{merge_request.target_branch}..source/#{merge_request.source_branch}")
+         else
+           patch = merge_repo.git.format_patch(default_options({stdout: true}), "#{merge_request.target_branch}..#{merge_request.source_branch}")
--- a/lib/gitlab/satellite/merge_action.rb
+++ b/lib/gitlab/satellite/merge_action.rb
+         diffs = diffs.map { |diff| Gitlab::Git::Diff.new(diff) }
+         return diffs
+       end
+     rescue Grit::Git::CommandFailed => ex
+       handle_exception(ex)
+     end
+
+     # Get commit as an email patch
+     def format_patch
+       in_locked_and_timed_satellite do |merge_repo|
+         prepare_satellite!(merge_repo)
+         update_satellite_source_and_target!(merge_repo)
+         if (merge_request.for_fork?)
+           patch = merge_repo.git.format_patch(default_options({stdout: true}), "origin/#{merge_request.target_branch}..source/#{merge_request.source_branch}")
+         else
+           patch = merge_repo.git.format_patch(default_options({stdout: true}), "#{merge_request.target_branch}..#{merge_request.source_branch}")