Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42

1 files changed, 0 insertions, 2 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
index 415f58ea8e6..a4afdee4d49 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
@@ -230,7 +230,6 @@ export default {
             v-if="!rebasingError"
             class="gl-w-100 gl-md-w-auto gl-flex-grow-1 gl-ml-0! gl-text-body! gl-md-mr-3"
             data-testid="rebase-message"
-            data-qa-selector="no_fast_forward_message_content"
           >
             <bold-text :message="$options.i18n.rebaseError" />
           </span>
@@ -247,7 +246,6 @@ export default {
           :loading="isMakingRequest"
           variant="confirm"
           size="small"
-          data-qa-selector="mr_rebase_button"
           data-testid="standard-rebase-button"
           class="gl-align-self-start"
           @click="tryRebase"