Commit a26e37de authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'sh-bump-gitaly-version-1.12.0' into 'master'

Bump Gitaly version to v1.12.0

See merge request gitlab-org/gitlab-ce!23996
parents 06cef29a f5847911
...@@ -163,10 +163,12 @@ module API ...@@ -163,10 +163,12 @@ module API
end end
def find_branch!(branch_name) def find_branch!(branch_name)
if Gitlab::GitRefValidator.validate(branch_name)
user_project.repository.find_branch(branch_name) || not_found!('Branch') user_project.repository.find_branch(branch_name) || not_found!('Branch')
rescue Gitlab::Git::CommandError else
render_api_error!('The branch refname is invalid', 400) render_api_error!('The branch refname is invalid', 400)
end end
end
def find_project_label(id) def find_project_label(id)
labels = available_labels_for(user_project) labels = available_labels_for(user_project)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment