Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/gitlab/task_helpers.rb b/lib/gitlab/task_helpers.rb
index 1ceccc64ec0..227962fc0f7 100644
--- a/lib/gitlab/task_helpers.rb
+++ b/lib/gitlab/task_helpers.rb
@@ -61,7 +61,7 @@ module Gitlab
     def prompt(message, choices = nil)
       begin
         print(message)
-        answer = STDIN.gets.chomp
+        answer = $stdin.gets.chomp
       end while choices.present? && !choices.include?(answer)
       answer
     end
@@ -70,12 +70,12 @@ module Gitlab
     #
     # message - custom message to display before input
     def prompt_for_password(message = 'Enter password: ')
-      unless STDIN.tty?
+      unless $stdin.tty?
         print(message)
-        return STDIN.gets.chomp
+        return $stdin.gets.chomp
       end
 
-      STDIN.getpass(message)
+      $stdin.getpass(message)
     end
 
     # Runs the given command and matches the output against the given pattern