Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 8 deletions

diff --git a/qa/qa/page/component/issue_board/show.rb b/qa/qa/page/component/issue_board/show.rb
index 0c840eba7ce..9e843630115 100644
--- a/qa/qa/page/component/issue_board/show.rb
+++ b/qa/qa/page/component/issue_board/show.rb
@@ -39,11 +39,6 @@ module QA
             element :boards_list
           end
 
-          view 'app/views/shared/boards/components/_board.html.haml' do
-            element :board_list
-            element :board_list_header
-          end
-
           view 'app/assets/javascripts/boards/toggle_focus.js' do
             element :focus_mode_button
           end
diff --git a/qa/qa/specs/features/browser_ui/3_create/gitaly/high_availability_spec.rb b/qa/qa/specs/features/browser_ui/3_create/gitaly/high_availability_spec.rb
index 3bb03f68d51..725fedfbb9b 100644
--- a/qa/qa/specs/features/browser_ui/3_create/gitaly/high_availability_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/gitaly/high_availability_spec.rb
@@ -11,14 +11,14 @@ module QA
         end
         let(:initial_file) { 'pushed_to_primary.txt' }
         let(:final_file) { 'pushed_to_secondary.txt' }
+        let(:praefect_manager) { Service::PraefectManager.new }
 
         before do
-          @praefect_manager = Service::PraefectManager.new
           Flow::Login.sign_in
         end
 
         after do
-          @praefect_manager.reset
+          praefect_manager.reset
         end
 
         it 'makes sure that automatic failover is happening' do
@@ -30,7 +30,7 @@ module QA
             push.file_content = "This should exist on both nodes"
           end
 
-          @praefect_manager.stop_primary_node
+          praefect_manager.stop_primary_node
 
           project.visit!