From c8596aa9152169c761faaa69f7d85ee5edb829f2 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Thu, 28 Sep 2017 10:46:43 -0500
Subject: Add period to multi-sentence rebase locally message

See https://gitlab.com/gitlab-org/gitlab-ce/issues/38251
---
 .../vue_merge_request_widget/components/states/mr_widget_conflicts.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
index 7beff1cb803..e745de89b8d 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
@@ -18,7 +18,7 @@ export default {
           v-if="mr.ffOnlyEnabled"
           class="bold">
           Fast-forward merge is not possible.
-          To merge this request, first rebase locally
+          To merge this request, first rebase locally.
         </span>
         <template v-else>
           <span class="bold">
-- 
cgit v1.2.1