diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-28 10:46:43 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-28 10:46:43 -0500 |
| commit | c8596aa9152169c761faaa69f7d85ee5edb829f2 (patch) | |
| tree | 3b479f774dfce3dd79b708e0e9f4fef1d9ed2b6b | |
| parent | 6f9a6d37a9237d19447c7936c53df02d841f5c66 (diff) | |
| download | gitlab-ce-c8596aa9152169c761faaa69f7d85ee5edb829f2.tar.gz | |
Add period to multi-sentence rebase locally message
See https://gitlab.com/gitlab-org/gitlab-ce/issues/38251
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js | 2 |
1 files changed, 1 insertions, 1 deletions
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"> |