Add latest changes from gitlab-org/gitlab@master

2 files changed, 40 insertions, 0 deletions

diff --git a/qa/qa/page/admin/settings/component/outbound_requests.rb b/qa/qa/page/admin/settings/component/outbound_requests.rb
new file mode 100644
index 00000000000..248ea5b6715
--- /dev/null
+++ b/qa/qa/page/admin/settings/component/outbound_requests.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Admin
+      module Settings
+        module Component
+          class OutboundRequests < Page::Base
+            view 'app/views/admin/application_settings/_outbound.html.haml' do
+              element :allow_requests_from_services_checkbox
+              element :save_changes_button
+            end
+
+            def allow_requests_to_local_network_from_services
+              check_allow_requests_to_local_network_from_services_checkbox
+              click_save_changes_button
+            end
+
+            private
+
+            def check_allow_requests_to_local_network_from_services_checkbox
+              check_element :allow_requests_from_services_checkbox
+            end
+
+            def click_save_changes_button
+              click_element :save_changes_button
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/admin/settings/network.rb b/qa/qa/page/admin/settings/network.rb
index fdb8fcda281..83566d3d1ca 100644
--- a/qa/qa/page/admin/settings/network.rb
+++ b/qa/qa/page/admin/settings/network.rb
@@ -9,6 +9,7 @@ module QA
 
           view 'app/views/admin/application_settings/network.html.haml' do
             element :ip_limits_section
+            element :outbound_requests_section
           end
 
           def expand_ip_limits(&block)
@@ -16,6 +17,12 @@ module QA
               Component::IpLimits.perform(&block)
             end
           end
+
+          def expand_outbound_requests(&block)
+            expand_section(:outbound_requests_section) do
+              Component::OutboundRequests.perform(&block)
+            end
+          end
         end
       end
     end