Add latest changes from gitlab-org/gitlab@master

3 files changed, 1 insertions, 25 deletions

diff --git a/qa/qa.rb b/qa/qa.rb
index 566effb3cd9..dccb95613f1 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -385,7 +385,6 @@ module QA
       module Deployments
         module Environments
           autoload :Index, 'qa/page/project/deployments/environments/index'
-          autoload :Show, 'qa/page/project/deployments/environments/show'
         end
       end
 
diff --git a/qa/qa/page/project/deployments/environments/show.rb b/qa/qa/page/project/deployments/environments/show.rb
deleted file mode 100644
index 48e4850d3be..00000000000
--- a/qa/qa/page/project/deployments/environments/show.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  module Page
-    module Project
-      module Deployments
-        module Environments
-          class Show < Page::Base
-            view 'app/views/projects/environments/_external_url.html.haml' do
-              element :view_deployment
-            end
-
-            def view_deployment(&block)
-              new_window = window_opened_by { click_element(:view_deployment) }
-
-              within_window(new_window, &block) if block
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb
index c1625f1e679..adacedb36ab 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb
@@ -41,7 +41,7 @@ module QA
 
       after do
         runner.remove_via_api!
-        group.remove_via_api!
+        [upstream_project, downstream_project].each(&:remove_via_api!)
       end
 
       it 'runs the pipeline with composed config', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1086' do