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

1 files changed, 12 insertions, 1 deletions

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