diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-05 13:20:15 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-05 13:20:15 +0300 |
| commit | dda326f1d390e360567ba8acaa135a1dfb98042c (patch) | |
| tree | f0868809bd5f560fa5651cb07fae35bb48d0d78f /lib/gitlab/git | |
| parent | 942488b8c420032a5b067d0a784c46b740a6f7ec (diff) | |
| parent | a6c7d8050eb6eeb0373f69a3f99c7f7b64f77e07 (diff) | |
Merge branch 'ce-4474-custom-additional-text-in-confirmation-email' into 'master'
Add custom additional text to emails -- CE backport
Closes gitlab-ee#4474
See merge request gitlab-org/gitlab-ce!18183
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/hook.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/hook.rb b/lib/gitlab/git/hook.rb index 24f027d8da4..7c201c6169b 100644 --- a/lib/gitlab/git/hook.rb +++ b/lib/gitlab/git/hook.rb @@ -95,13 +95,13 @@ module Gitlab args = [ref, oldrev, newrev] stdout, stderr, status = Open3.capture3(env, path, *args, options) - [status.success?, (stderr.presence || stdout).gsub(/\R/, "<br>").html_safe] + [status.success?, Gitlab::Utils.nlbr(stderr.presence || stdout)] end def retrieve_error_message(stderr, stdout) err_message = stderr.read err_message = err_message.blank? ? stdout.read : err_message - err_message.gsub(/\R/, "<br>").html_safe + Gitlab::Utils.nlbr(err_message) end end end |