Add latest changes from gitlab-org/gitlab@master

5 files changed, 6 insertions, 6 deletions

diff --git a/qa/qa/resource/base.rb b/qa/qa/resource/base.rb
index ae20ca1a98e..3bb62703290 100644
--- a/qa/qa/resource/base.rb
+++ b/qa/qa/resource/base.rb
@@ -64,7 +64,7 @@ module QA
       end
 
       def visit!
-        Runtime::Logger.debug(%Q[Visiting #{self.class.name} at "#{web_url}"]) if Runtime::Env.debug?
+        Runtime::Logger.debug(%Q[Visiting #{self.class.name} at "#{web_url}"])
 
         Support::Retrier.retry_until do
           visit(web_url)
diff --git a/qa/qa/resource/user.rb b/qa/qa/resource/user.rb
index bdbe5f3ef51..9544a3e80b3 100644
--- a/qa/qa/resource/user.rb
+++ b/qa/qa/resource/user.rb
@@ -79,7 +79,7 @@ module QA
       def api_delete
         super
 
-        QA::Runtime::Logger.debug("Deleted user '#{username}'") if Runtime::Env.debug?
+        QA::Runtime::Logger.debug("Deleted user '#{username}'")
       end
 
       def api_delete_path
diff --git a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
index 57063e91532..90290b4f2a0 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
@@ -24,7 +24,7 @@ module QA
 
         # Wait for Action Mailer to deliver messages
         mailhog_json = Support::Retrier.retry_until(sleep_interval: 1) do
-          Runtime::Logger.debug(%Q[retrieving "#{QA::Runtime::MailHog.api_messages_url}"]) if Runtime::Env.debug?
+          Runtime::Logger.debug(%Q[retrieving "#{QA::Runtime::MailHog.api_messages_url}"])
 
           mailhog_response = get QA::Runtime::MailHog.api_messages_url
 
diff --git a/qa/qa/vendor/saml_idp/page/login.rb b/qa/qa/vendor/saml_idp/page/login.rb
index 9ebcabe15fc..041b4a0feee 100644
--- a/qa/qa/vendor/saml_idp/page/login.rb
+++ b/qa/qa/vendor/saml_idp/page/login.rb
@@ -8,7 +8,7 @@ module QA
       module Page
         class Login < Page::Base
           def login(username, password)
-            QA::Runtime::Logger.debug("Logging into SAMLIdp with username: #{username} and password:#{password}") if QA::Runtime::Env.debug?
+            QA::Runtime::Logger.debug("Logging into SAMLIdp with username: #{username} and password:#{password}")
 
             fill_in 'username', with: username
             fill_in 'password', with: password
@@ -21,7 +21,7 @@ module QA
 
           def login_required?
             login_required = page.has_text?('Enter your username and password')
-            QA::Runtime::Logger.debug("login_required: #{login_required}") if QA::Runtime::Env.debug?
+            QA::Runtime::Logger.debug("login_required: #{login_required}")
             login_required
           end
         end
diff --git a/qa/spec/spec_helper.rb b/qa/spec/spec_helper.rb
index 36a1b901c65..3a26ed89e9c 100644
--- a/qa/spec/spec_helper.rb
+++ b/qa/spec/spec_helper.rb
@@ -20,7 +20,7 @@ RSpec.configure do |config|
   QA::Specs::Helpers::Quarantine.configure_rspec
 
   config.before do |example|
-    QA::Runtime::Logger.debug("\nStarting test: #{example.full_description}\n") if QA::Runtime::Env.debug?
+    QA::Runtime::Logger.debug("\nStarting test: #{example.full_description}\n")
   end
 
   config.after(:context) do