summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-20 12:15:52 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-20 12:15:52 +0000
commitfa10e47f6e1dced92a7b28dee7fab08abeead777 (patch)
tree67d4d292b548fd0007b9c7d0bdc86e47954d634b /config/initializers
parentb762fdffd054da31601d4e9f8dbd35ff9d198b59 (diff)
downloadgitlab-ce-fa10e47f6e1dced92a7b28dee7fab08abeead777.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/net_http_response_patch.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/net_http_response_patch.rb b/config/initializers/net_http_response_patch.rb
index 4ffe227a3fd..4f3eaeec24a 100644
--- a/config/initializers/net_http_response_patch.rb
+++ b/config/initializers/net_http_response_patch.rb
@@ -24,10 +24,12 @@ module Net
line = line.sub(/\s{0,10}\z/, '')
break if line.empty?
if line[0] == ?\s or line[0] == ?\t and value
+ # rubocop:disable Gitlab/NoCodeCoverageComment
# :nocov:
value << ' ' unless value.empty?
value << line.strip
# :nocov:
+ # rubocop:enable Gitlab/NoCodeCoverageComment
else
yield key, value if key
key, value = line.strip.split(/\s{0,10}:\s{0,10}/, 2)