diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-19 06:09:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-19 06:09:45 +0300 |
| commit | bf53a3fd78390334ea7af084a64f74bf83c985e0 (patch) | |
| tree | 3598cb074cb3be1d68aba19d572492cf2696ac1e /app/assets/javascripts/vue_merge_request_widget | |
| parent | 3024d3ac9e2c7242cd3cfce70b6c103f357fa6a9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue index 7071759b8bb..0ce8389579d 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue @@ -488,7 +488,7 @@ export default { mergeAndSquashCommitTemplatesHintText: s__( 'mrWidget|To change these default messages, edit the templates for both the merge and squash commit messages. %{linkStart}Learn more%{linkEnd}.', ), - sourceDivergedFromTargetText: s__('mrWidget|The source branch is %{link} the target branch'), + sourceDivergedFromTargetText: s__('mrWidget|The source branch is %{link} the target branch.'), divergedCommits: (count) => n__('%d commit behind', '%d commits behind', count), }, }; |