Support editing target branch of merge request

Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130

5 files changed, 55 insertions, 2 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 5690c375b96..f1f9f23b12c 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -197,7 +197,6 @@ class MergeRequest < ActiveRecord::Base
   def update_merge_request_diff
     if source_branch_changed? || target_branch_changed?
       reload_code
-      mark_as_unchecked
     end
   end
 
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index c5769a5ad27..1d99223cfe6 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -20,4 +20,10 @@ class IssuableBaseService < BaseService
     SystemNoteService.change_title(
       issuable, issuable.project, current_user, old_title)
   end
+
+  def create_branch_change_note(issuable, branch_type, old_branch, new_branch)
+    SystemNoteService.change_branch(
+      issuable, issuable.project, current_user, branch_type,
+      old_branch, new_branch)
+  end
 end
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index 34fd59d6927..34c190bf621 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -5,7 +5,7 @@ require_relative 'close_service'
 module MergeRequests
   class UpdateService < MergeRequests::BaseService
     def execute(merge_request)
-      # We dont allow change of source/target projects
+      # We don't allow change of source/target projects
       # after merge request was created
       params.except!(:source_project_id)
       params.except!(:target_project_id)
@@ -41,6 +41,12 @@ module MergeRequests
           )
         end
 
+        if merge_request.previous_changes.include?('target_branch')
+          create_branch_change_note(merge_request, 'target',
+                                    merge_request.previous_changes['target_branch'].first,
+                                    merge_request.target_branch)
+        end
+
         if merge_request.previous_changes.include?('milestone_id')
           create_milestone_note(merge_request)
         end
@@ -54,6 +60,11 @@ module MergeRequests
           create_title_change_note(merge_request, merge_request.previous_changes['title'].first)
         end
 
+        if merge_request.previous_changes.include?('target_branch') ||
+            merge_request.previous_changes.include?('source_branch')
+          merge_request.mark_as_unchecked
+        end
+
         merge_request.notice_added_references(merge_request.project, current_user)
         execute_hooks(merge_request, 'update')
       end
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 1527ae0486d..b6801a92330 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -149,6 +149,25 @@ class SystemNoteService
     create_note(noteable: noteable, project: project, author: author, note: body)
   end
 
+  # Called when a branch in Noteable is changed
+  #
+  # noteable    - Noteable object
+  # project     - Project owning noteable
+  # author      - User performing the change
+  # branch_type - 'source' or 'target'
+  # old_branch  - old branch name
+  # new_branch  - new branch nmae
+  #
+  # Example Note text:
+  #
+  #   "Target branch changed from `Old` to `New`"
+  #
+  # Returns the created Note object
+  def self.change_branch(noteable, project, author, branch_type, old_branch, new_branch)
+    body = "#{branch_type} branch changed from `#{old_branch}` to `#{new_branch}`".capitalize
+    create_note(noteable: noteable, project: project, author: author, note: body)
+  end
+
   # Called when a Mentionable references a Noteable
   #
   # noteable  - Noteable object being referenced
diff --git a/app/views/projects/_issuable_form.html.haml b/app/views/projects/_issuable_form.html.haml
index 2292aaaa214..b1e337c3977 100644
--- a/app/views/projects/_issuable_form.html.haml
+++ b/app/views/projects/_issuable_form.html.haml
@@ -79,6 +79,24 @@
     - if can? current_user, :admin_label, issuable.project
       = link_to 'Create new label', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank
 
+- if issuable.is_a?(MergeRequest)
+  %hr
+    - unless @merge_request.persisted?
+      .form-group
+        = f.label :source_branch, class: 'control-label' do
+          %i.fa.fa-code-fork
+          Source Branch
+        .col-sm-10
+          = f.select(:source_branch, [@merge_request.source_branch], { }, { class: 'source_branch select2 span2', disabled: true })
+          %p.help-block
+          = link_to 'Change source branch', mr_change_branches_path(@merge_request)
+  .form-group
+    = f.label :target_branch, class: 'control-label' do
+      %i.fa.fa-code-fork
+      Target Branch
+    .col-sm-10
+      = f.select(:target_branch, @merge_request.target_branches, { include_blank: "Select branch" }, { class: 'target_branch select2 span2' })
+
 .form-actions
   - if !issuable.project.empty_repo? && (guide_url = contribution_guide_url(issuable.project)) && !issuable.persisted?
     %p