summaryrefslogtreecommitdiff
path: root/app/controllers/projects/commit_controller.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-02-01 15:18:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-02-01 15:18:50 +0000
commit3bdc719293f08ed357ef452f3e2a11a9b29531e7 (patch)
treeb5a03109fd3704194d5707759d5ec0e4650bf177 /app/controllers/projects/commit_controller.rb
parent1ae73e5bfcb2dc4a49f40886f729fc4797ba2a65 (diff)
downloadgitlab-ce-3bdc719293f08ed357ef452f3e2a11a9b29531e7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
-rw-r--r--app/controllers/projects/commit_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 62935e133c5..0ce0b8b8895 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -92,6 +92,8 @@ class Projects::CommitController < Projects::ApplicationController
end
def branches
+ return git_not_found! unless commit
+
# branch_names_contains/tag_names_contains can take a long time when there are thousands of
# branches/tags - each `git branch --contains xxx` request can consume a cpu core.
# so only do the query when there are a manageable number of branches/tags