Add latest changes from gitlab-org/gitlab@13-4-stable-ee

2 files changed, 7 insertions, 5 deletions

diff --git a/lib/gitlab/git/pre_receive_error.rb b/lib/gitlab/git/pre_receive_error.rb
index 7a6f27179f0..b84ac656927 100644
--- a/lib/gitlab/git/pre_receive_error.rb
+++ b/lib/gitlab/git/pre_receive_error.rb
@@ -18,13 +18,15 @@ module Gitlab
 
       attr_reader :raw_message
 
-      def initialize(message = '', user_message = '')
+      def initialize(message = '', fallback_message: '')
         @raw_message = message
 
-        if user_message.present?
-          super(sanitize(user_message))
+        sanitized_msg = sanitize(message)
+
+        if sanitized_msg.present?
+          super(sanitized_msg)
         else
-          super(sanitize(message))
+          super(fallback_message)
         end
       end
 
diff --git a/lib/gitlab/gitaly_client/operation_service.rb b/lib/gitlab/gitaly_client/operation_service.rb
index 513063c60d2..786eb3ca4ae 100644
--- a/lib/gitlab/gitaly_client/operation_service.rb
+++ b/lib/gitlab/gitaly_client/operation_service.rb
@@ -179,7 +179,7 @@ module Gitlab
         )
 
         if response.pre_receive_error.present?
-          raise Gitlab::Git::PreReceiveError.new(response.pre_receive_error, "GL-HOOK-ERR: pre-receive hook failed.")
+          raise Gitlab::Git::PreReceiveError.new(response.pre_receive_error, fallback_message: "pre-receive hook failed.")
         end
 
         Gitlab::Git::OperationService::BranchUpdate.from_gitaly(response.branch_update)