summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranz Liedke <franz@develophp.org>2018-07-31 14:42:17 +0000
committerFranz Liedke <franz@develophp.org>2018-08-25 23:02:36 +0200
commit50f9e92651c1b82d8f8df960754f2736a606d6f8 (patch)
tree54f8fa09f28f65c8d85efdfc8bff04e6048779b5
parent56a3f7b7c65e87b73ec081dacea4cd04e7780c6f (diff)
downloadgitlab-ce-50f9e92651c1b82d8f8df960754f2736a606d6f8.tar.gz
Fix fallback logic for automatic MR title assignment
-rw-r--r--app/services/merge_requests/build_service.rb2
-rw-r--r--changelogs/unreleased/fix-mr-title-fallback-logic.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index bc988eb2a26..414922b5753 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -162,7 +162,7 @@ module MergeRequests
def assign_title_from_issue
return unless issue
- merge_request.title = "Resolve \"#{issue.title}\"" if issue.is_a?(Issue)
+ merge_request.title ||= "Resolve \"#{issue.title}\"" if issue.is_a?(Issue)
return if merge_request.title.present?
diff --git a/changelogs/unreleased/fix-mr-title-fallback-logic.yml b/changelogs/unreleased/fix-mr-title-fallback-logic.yml
new file mode 100644
index 00000000000..5056c38573b
--- /dev/null
+++ b/changelogs/unreleased/fix-mr-title-fallback-logic.yml
@@ -0,0 +1,5 @@
+---
+title: Fix fallback logic for automatic MR title assignment
+merge_request: 20930
+author: Franz Liedke
+type: fixed