Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 7 deletions

diff --git a/qa/qa/flow/saml.rb b/qa/qa/flow/saml.rb
index 0b9f9f94fbd..676be2beb01 100644
--- a/qa/qa/flow/saml.rb
+++ b/qa/qa/flow/saml.rb
@@ -38,7 +38,9 @@ module QA
 
       def visit_saml_sso_settings(group, direct: false)
         if direct
-          page.visit "#{group.web_url}/-/saml"
+          url = "#{group.web_url}/-/saml"
+          Runtime::Logger.debug("Visiting url \"#{url}\" directly")
+          page.visit url
         else
           group.visit!
 
diff --git a/qa/qa/runtime/feature.rb b/qa/qa/runtime/feature.rb
index 9cb2c925b19..5e948b5b850 100644
--- a/qa/qa/runtime/feature.rb
+++ b/qa/qa/runtime/feature.rb
@@ -48,6 +48,12 @@ module QA
         feature && feature["state"] == "on"
       end
 
+      def get_features
+        request = Runtime::API::Request.new(api_client, "/features")
+        response = get(request.url)
+        response.body
+      end
+
       private
 
       def api_client
@@ -76,12 +82,6 @@ module QA
           raise SetFeatureError, "Setting feature flag #{key} to #{value} failed with `#{response}`."
         end
       end
-
-      def get_features
-        request = Runtime::API::Request.new(api_client, "/features")
-        response = get(request.url)
-        response.body
-      end
     end
   end
 end