diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index d6bcb852a4655c84dc829d63a7be75b442b39e88..77c7114a80be5ff4c19117120726c44c343e253d 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -200,7 +200,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController source_branch: @merge_request.revert_branch_name, target_branch: @merge_request.target_branch, source_project_id: @merge_request.target_project_id, - target_project_id: @merge_request.target_project_id + target_project_id: @merge_request.target_project_id, + description: "Reverts #{@merge_request.to_reference}" }} redirect_to new_namespace_project_merge_request_url(@project.namespace, @project, url_params) diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index a9b29f9654d716553330b62c48860e4da4d7d1bd..c0700d953ddf2fd75cf8e7575c9a8872d0eec6b4 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -56,7 +56,7 @@ module MergeRequests if commits && commits.count == 1 commit = commits.first merge_request.title = commit.title - merge_request.description = commit.description.try(:strip) + merge_request.description ||= commit.description.try(:strip) else merge_request.title = merge_request.source_branch.titleize.humanize end