diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-20 00:08:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-20 00:08:17 +0300 |
| commit | 3d6aa9071097f5070c801bee13a619da0a297d07 (patch) | |
| tree | b455237758a12fefeec49c29cc8655cb63e118ff /app/assets/javascripts/vue_merge_request_widget/components | |
| parent | abe6e7a2e7a456fa05f4ebeb28f8747a92cf59b1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue | 7 |
1 files changed, 2 insertions, 5 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 4fb95fe635c..9541058ec2a 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 @@ -711,6 +711,7 @@ export default { <div v-if="!restructuredWidgetShowMergeButtons" class="gl-w-full gl-order-n1 gl-text-gray-500" + data-qa-selector="merged_status_content" > <strong v-if="mr.state !== 'closed'"> {{ __('Merge details') }} @@ -788,11 +789,7 @@ export default { </div> </div> <template v-if="shouldShowMergeControls && !glFeatures.restructuredMrWidget"> - <div - v-if="!shouldShowMergeEdit" - class="mr-fast-forward-message" - data-qa-selector="fast_forward_message_content" - > + <div v-if="!shouldShowMergeEdit" class="mr-fast-forward-message"> {{ __('Fast-forward merge without a merge commit') }} </div> <commits-header |