summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-10-06 13:40:17 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-10-06 13:40:17 +0000
commitf55f24c49747f74659c4aa8ade48fd167fe67034 (patch)
treea964f7d371777132da337ad735d589efd9ed4276 /lib
parentdd42cb5f8f4724fa899dae929975da78846f0950 (diff)
parent351fde1b908296802fe65112f2ff1eb4aa6cb5db (diff)
downloadgitlab-ce-f55f24c49747f74659c4aa8ade48fd167fe67034.tar.gz
Merge branch 'valid-branch-name-dash-bug' into 'master'
Prevent branches or tags from starting with invalid characters (e.g. -, .) Closes #38817 See merge request gitlab-org/gitlab-ce!14710
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git_ref_validator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git_ref_validator.rb b/lib/gitlab/git_ref_validator.rb
index a3c6b21a6a1..2e3e4fc3f1f 100644
--- a/lib/gitlab/git_ref_validator.rb
+++ b/lib/gitlab/git_ref_validator.rb
@@ -11,7 +11,7 @@ module Gitlab
return false if ref_name.start_with?('refs/remotes/')
Gitlab::Utils.system_silent(
- %W(#{Gitlab.config.git.bin_path} check-ref-format refs/#{ref_name}))
+ %W(#{Gitlab.config.git.bin_path} check-ref-format --branch #{ref_name}))
end
end
end