diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 16:34:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 16:34:10 +0000 |
| commit | bfa4e0b43c216ba5f3201058668d3a65743a9910 (patch) | |
| tree | 2265d2644cc8821128a3de731aff762b14564690 /lib/gitlab/git | |
| parent | 6689552c4793623a9d47986328a0379ab215f9bc (diff) | |
| download | gitlab-ce-bfa4e0b43c216ba5f3201058668d3a65743a9910.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/pre_receive_error.rb | 10 |
1 files changed, 6 insertions, 4 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 |