diff options
author | Stan Hu <stanhu@gmail.com> | 2015-05-28 18:00:37 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-05-29 04:08:08 -0700 |
commit | 5e4384ec9bc5e015c6a5427e337d8f5412e91d1e (patch) | |
tree | 6ebe10b61122e0128027529676df362aadaee77b /app/services/merge_requests | |
parent | 06250eef2e12ed509b88f3770ae6d3fa4614b74d (diff) | |
download | gitlab-ce-5e4384ec9bc5e015c6a5427e337d8f5412e91d1e.tar.gz |
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
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r-- | app/services/merge_requests/update_service.rb | 13 |
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 |