From 5bb5019e043b470a1e09dec2fe05efd57498dce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= Date: Mon, 1 Feb 2016 15:35:11 -0500 Subject: [PATCH] Use adequate description for new MR. --- app/controllers/projects/merge_requests_controller.rb | 3 ++- app/services/merge_requests/build_service.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index d6bcb852a4..77c7114a80 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 a9b29f9654..c0700d953d 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