diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-08 13:55:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-08 13:55:10 +0000 |
| commit | 9d9898107ff5185692a670c507d4454232425b82 (patch) | |
| tree | 78c8f3c84335a8f41967cf75f720a4a226c0f72f | |
| parent | 3e1a360f6771cfd9dd48645781c0f13b1ec4be7d (diff) | |
| download | gitlab-ce-9d9898107ff5185692a670c507d4454232425b82.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
| -rw-r--r-- | changelogs/unreleased/sh-fix-rake-verify-task.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/verify/batch_verifier.rb | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/changelogs/unreleased/sh-fix-rake-verify-task.yml b/changelogs/unreleased/sh-fix-rake-verify-task.yml new file mode 100644 index 00000000000..e69d9d8e06d --- /dev/null +++ b/changelogs/unreleased/sh-fix-rake-verify-task.yml @@ -0,0 +1,5 @@ +--- +title: Fix gitlab:*:check Rake tasks +merge_request: 35944 +author: +type: fixed 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 |