diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-26 00:07:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-26 00:07:36 +0300 |
| commit | 23e3a19888835a5a7fc68a081ba1e050e9baf681 (patch) | |
| tree | c56f8e9a080e876b55a6f0e987cebe599921f1af /app/assets/javascripts/vue_merge_request_widget | |
| parent | ff549ec680715e4ea1daf0cee457f29dfe3b6062 (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 | 7 |
1 files changed, 6 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 6ce4e1b4706..77151ab4307 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 @@ -524,6 +524,7 @@ export default { v-model="removeSourceBranch" :disabled="isRemoveSourceBranchButtonDisabled" class="js-remove-source-branch-checkbox gl-display-flex gl-align-items-center gl-mr-5 gl-mb-3 gl-md-mb-0" + data-testid="delete-source-branch-checkbox" > {{ __('Delete source branch') }} </gl-form-checkbox> @@ -699,7 +700,11 @@ export default { :merge-commit-path="mr.mergeCommitPath" /> </li> - <li v-if="mr.state !== 'closed'" class="gl-line-height-normal"> + <li + v-if="mr.state !== 'closed'" + class="gl-line-height-normal" + data-testid="source-branch-deleted-text" + > {{ sourceBranchDeletedText }} </li> <li v-if="mr.relatedLinks" class="gl-line-height-normal"> |