Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/qa/qa/page/project/settings/mirroring_repositories.rb b/qa/qa/page/project/settings/mirroring_repositories.rb
index 4efe5212c14..c9ce80076e2 100644
--- a/qa/qa/page/project/settings/mirroring_repositories.rb
+++ b/qa/qa/page/project/settings/mirroring_repositories.rb
@@ -29,7 +29,6 @@ module QA
 
           view 'app/views/shared/_remote_mirror_update_button.html.haml' do
             element :update_now_button
-            element :updating_button
           end
 
           view 'app/views/projects/mirrors/_ssh_host_keys.html.haml' do
@@ -86,11 +85,10 @@ module QA
 
           def update(url)
             row_index = find_repository_row_index(url)
-
             within_element_by_index(:mirrored_repository_row_container, row_index) do
               # When a repository is first mirrored, the update process might
               # already be started, so the button is already "clicked"
-              click_element :update_now_button unless has_element? :updating_button
+              click_element :update_now_button if has_element?(:update_now_button, wait: 0)
             end
           end
 
diff --git a/qa/qa/resource/runner_base.rb b/qa/qa/resource/runner_base.rb
index 278729eb50f..5d514b8977b 100644
--- a/qa/qa/resource/runner_base.rb
+++ b/qa/qa/resource/runner_base.rb
@@ -50,7 +50,8 @@ module QA
       #
       def fabricate_via_api!
         api_get
-      rescue NoValueError
+      rescue NoValueError => e
+        Runtime::Logger.info("Runner api_get exception caught and handled: #{e}")
         # Start container on initial fabrication and populate all attributes once id is known
         # see: https://docs.gitlab.com/ee/api/runners.html#get-runners-details
         start_container_and_register
@@ -119,6 +120,7 @@ module QA
       def populate_initial_id
         tag_list = tags ? { tag_list: tags.compact.join(',') } : {}
         runner = runner(**tag_list)
+        Runtime::Logger.debug("Details of the runner fetched using tag_list: #{runner}")
         @id = runner[:id]
       end