diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-20 15:15:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-20 15:15:52 +0300 |
| commit | fa10e47f6e1dced92a7b28dee7fab08abeead777 (patch) | |
| tree | 67d4d292b548fd0007b9c7d0bdc86e47954d634b /config | |
| parent | b762fdffd054da31601d4e9f8dbd35ff9d198b59 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/git_abuse_rate_limit_feature_flag.yml | 8 | ||||
| -rw-r--r-- | config/initializers/net_http_response_patch.rb | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/config/feature_flags/development/git_abuse_rate_limit_feature_flag.yml b/config/feature_flags/development/git_abuse_rate_limit_feature_flag.yml deleted file mode 100644 index c71a5064b29..00000000000 --- a/config/feature_flags/development/git_abuse_rate_limit_feature_flag.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: git_abuse_rate_limit_feature_flag -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87872 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364782 -milestone: '15.1' -type: development -group: group::anti-abuse -default_enabled: false 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) |