Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 2 deletions

diff --git a/qa/qa/page/project/operations/metrics/show.rb b/qa/qa/page/project/operations/metrics/show.rb
index 7576e11bf59..22d22af5a9a 100644
--- a/qa/qa/page/project/operations/metrics/show.rb
+++ b/qa/qa/page/project/operations/metrics/show.rb
@@ -58,7 +58,9 @@ module QA
             end
 
             def has_edit_dashboard_enabled?
-              within_element :prometheus_graphs do
+              click_element :actions_menu_dropdown
+
+              within_element :actions_menu_dropdown do
                 has_element? :edit_dashboard_button_enabled
               end
             end
diff --git a/qa/qa/service/praefect_manager.rb b/qa/qa/service/praefect_manager.rb
index d415c246021..1c0002fd76d 100644
--- a/qa/qa/service/praefect_manager.rb
+++ b/qa/qa/service/praefect_manager.rb
@@ -39,6 +39,7 @@ module QA
             break line if line.start_with?('gitaly_cluster')
             break nil if line.include?('Something went wrong when getting replicas')
           end
+          next false unless replicas
 
           # We want to know if the checksums are identical
           replicas&.split('|')&.map(&:strip)&.slice(1..3)&.uniq&.one?
diff --git a/qa/qa/specs/features/api/3_create/repository/backend_node_recovery_spec.rb b/qa/qa/specs/features/api/3_create/repository/backend_node_recovery_spec.rb
index 77d72bc1bb3..89ce4a820b4 100644
--- a/qa/qa/specs/features/api/3_create/repository/backend_node_recovery_spec.rb
+++ b/qa/qa/specs/features/api/3_create/repository/backend_node_recovery_spec.rb
@@ -55,7 +55,6 @@ module QA
           praefect_manager.wait_for_health_check_current_primary_node
 
           # Confirm dataloss (i.e., inconsistent nodes)
-          expect(praefect_manager.dataloss?).to be true
           expect(praefect_manager.replicated?(project.id)).to be false
 
           # Reconcile nodes to recover from dataloss