diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-31 17:32:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-31 17:32:24 +0300 |
| commit | f5fe9b63037d428aecb04c375579ef022ba98e1d (patch) | |
| tree | 3ae39e605490a5eb4fdaf5adcbd4f54d8aadb990 /lib | |
| parent | 920cbcb38960331cd5e9315e63b2d808fd1a1e48 (diff) | |
Add latest changes from gitlab-org/security/gitlab@16-2-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/checks/branch_check.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/checks/branch_check.rb b/lib/gitlab/checks/branch_check.rb index 8be1e1716ec..aa89c2711f9 100644 --- a/lib/gitlab/checks/branch_check.rb +++ b/lib/gitlab/checks/branch_check.rb @@ -43,7 +43,7 @@ module Gitlab def prohibited_branch_checks return if deletion? - if branch_name =~ %r{\A\h{40}(/|\z)} + if branch_name =~ %r{\A\h{40}(-/|/|\z)} raise GitAccess::ForbiddenError, ERROR_MESSAGES[:prohibited_hex_branch_name] end |