diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 15:07:47 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 15:07:47 +0000 |
commit | 6f2065c468b05658125b746169c56764a8ccddb1 (patch) | |
tree | 544a488ae2e65e2fcfe4acce4e56623b85bbce5e /lib/gitlab/git_access_snippet.rb | |
parent | e6baeabaa9651d90b03bb64ffce75a2c3cb89aab (diff) | |
download | gitlab-ce-6f2065c468b05658125b746169c56764a8ccddb1.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/git_access_snippet.rb')
-rw-r--r-- | lib/gitlab/git_access_snippet.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/gitlab/git_access_snippet.rb b/lib/gitlab/git_access_snippet.rb index 3ba2fcecd6f..e11c1ea527c 100644 --- a/lib/gitlab/git_access_snippet.rb +++ b/lib/gitlab/git_access_snippet.rb @@ -98,10 +98,7 @@ module Gitlab def check_single_change_access(change) Checks::SnippetCheck.new(change, logger: logger).validate! - - if Feature.enabled?(:snippet_count_check) - Checks::PushFileCountCheck.new(change, repository: repository, limit: Snippet::MAX_FILE_COUNT, logger: logger).validate! - end + Checks::PushFileCountCheck.new(change, repository: repository, limit: Snippet::MAX_FILE_COUNT, logger: logger).validate! rescue Checks::TimedLogger::TimeoutError raise TimeoutError, logger.full_message end |