diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-08 13:55:03 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-08 13:55:03 +0000 |
commit | cd1cc23153ed8115bc565f62b5a9f4eddc0942ca (patch) | |
tree | b379b2c66a70ffbb0d3baf71bdcc89eba8e434f2 /lib | |
parent | 755aa9544e3f5595cdc4f7a9d746758670d2393b (diff) | |
download | gitlab-ce-cd1cc23153ed8115bc565f62b5a9f4eddc0942ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/verify/batch_verifier.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab/verify/batch_verifier.rb b/lib/gitlab/verify/batch_verifier.rb index dbda19a4a66..fc114a4e9dd 100644 --- a/lib/gitlab/verify/batch_verifier.rb +++ b/lib/gitlab/verify/batch_verifier.rb @@ -71,9 +71,8 @@ module Gitlab # It's already set to Logger::INFO, but acts as if it is set to # Logger::DEBUG, and this fixes it... def fix_google_api_logger - if Object.const_defined?('Google::Apis') - Google::Apis.logger.level = Logger::INFO - end + require 'google/apis' + Google::Apis.logger.level = Logger::INFO end # This should return an ActiveRecord::Relation suitable for calling #in_batches on |