summaryrefslogtreecommitdiff
path: root/app/finders
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-10-06 12:11:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-10-06 12:11:40 +0000
commit0d1b0d5d03389eea2a4435eea47ec0a37cce9b26 (patch)
treef1e693f29ed5cdcebaf9424b1b98ffe12030ad13 /app/finders
parentb02d831a00f9f87b95174806b4d04a800001dc38 (diff)
downloadgitlab-ce-0d1b0d5d03389eea2a4435eea47ec0a37cce9b26.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/tags_finder.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/finders/tags_finder.rb b/app/finders/tags_finder.rb
index d9848d027cf..0ccbbdc1b87 100644
--- a/app/finders/tags_finder.rb
+++ b/app/finders/tags_finder.rb
@@ -7,6 +7,9 @@ class TagsFinder < GitRefsFinder
def execute
tags = repository.tags_sorted_by(sort)
- by_search(tags)
+
+ [by_search(tags), nil]
+ rescue Gitlab::Git::CommandError => e
+ [[], e]
end
end