384a92b736
Before a 404 would be rendered only after a request to Gitaly would return with an InvalidArgument error. Now we check that the ref have a valid format before sending it to Gitaly. In both cases, a 404 is returned to the user, but this change prevents Gitaly from generating error noise in production. Closes https://gitlab.com/gitlab-org/gitaly/issues/1425
35 lines
986 B
Ruby
35 lines
986 B
Ruby
# frozen_string_literal: true
|
|
|
|
module RendersCommits
|
|
def limited_commits(commits)
|
|
if commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
|
|
[
|
|
commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE),
|
|
commits.size - MergeRequestDiff::COMMITS_SAFE_SIZE
|
|
]
|
|
else
|
|
[commits, 0]
|
|
end
|
|
end
|
|
|
|
# This is used as a helper method in a controller.
|
|
# rubocop: disable Gitlab/ModuleWithInstanceVariables
|
|
def set_commits_for_rendering(commits)
|
|
@total_commit_count = commits.size
|
|
limited, @hidden_commit_count = limited_commits(commits)
|
|
prepare_commits_for_rendering(limited)
|
|
end
|
|
# rubocop: enable Gitlab/ModuleWithInstanceVariables
|
|
|
|
def prepare_commits_for_rendering(commits)
|
|
Banzai::CommitRenderer.render(commits, @project, current_user) # rubocop:disable Gitlab/ModuleWithInstanceVariables
|
|
|
|
commits
|
|
end
|
|
|
|
def valid_ref?(ref_name)
|
|
return true unless ref_name.present?
|
|
|
|
Gitlab::GitRefValidator.validate(ref_name)
|
|
end
|
|
end
|