Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 5 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
index e94e0fbe6dc..eec51ddde53 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
@@ -205,9 +205,7 @@ export default {
               data-qa-selector="merge_request_pipeline_info_content"
               class="gl-display-flex gl-flex-wrap gl-align-items-center gl-justify-content-space-between"
             >
-              <p
-                class="mr-pipeline-title gl-m-0! gl-mr-3! gl-font-weight-bold gl-line-height-32 gl-text-gray-900"
-              >
+              <p class="mr-pipeline-title gl-m-0! gl-mr-3! gl-font-weight-bold gl-text-gray-900">
                 {{ pipeline.details.event_type_name }}
                 <gl-link
                   :href="pipeline.path"
@@ -253,7 +251,7 @@ export default {
                   v-safe-html="sourceBranchLink"
                   :title="sourceBranch"
                   truncate-target="child"
-                  class="label-branch label-truncate gl-font-weight-normal gl-vertical-align-text-bottom"
+                  class="label-branch label-truncate gl-font-weight-normal"
                 />
               </template>
               <template v-if="finishedAt">
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
index acdcbf7afd7..537fdf8cdf8 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
@@ -569,7 +569,7 @@ export default {
           v-if="hasMergeError"
           type="danger"
           dismissible
-          data-testid="merge_error"
+          data-testid="merge-error"
         >
           <span v-safe-html="mergeError"></span>
         </mr-widget-alert-message>
@@ -577,6 +577,7 @@ export default {
           v-if="showMergePipelineForkWarning"
           type="warning"
           :help-path="mr.mergeRequestPipelinesHelpPath"
+          data-testid="merge-pipeline-fork-warning"
         >
           {{
             s__(