summaryrefslogtreecommitdiff
path: root/lib/gitlab/email/hook/disable_email_interceptor.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-07-10 19:26:48 +0000
committerStan Hu <stanhu@gmail.com>2019-07-10 19:26:48 +0000
commit607958d1cf76434fc713e0c342f0bf04c0aeec32 (patch)
tree40707956c6a5942b6301b18b2e85e5336fa590c3 /lib/gitlab/email/hook/disable_email_interceptor.rb
parent82503745143faf2b71185c9f392dbfd00d6d587e (diff)
parent0ab89d8e36ba58a95244b4c6dd49d53fac7a699f (diff)
downloadgitlab-ce-607958d1cf76434fc713e0c342f0bf04c0aeec32.tar.gz
Merge branch '54102-add-rubocop-for-rails-logger' into 'master'
Adds a Rubocop cop for Rails.logger Closes #54102 See merge request gitlab-org/gitlab-ce!30415
Diffstat (limited to 'lib/gitlab/email/hook/disable_email_interceptor.rb')
-rw-r--r--lib/gitlab/email/hook/disable_email_interceptor.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/email/hook/disable_email_interceptor.rb b/lib/gitlab/email/hook/disable_email_interceptor.rb
index 6b6b1d85109..58dc1527c7a 100644
--- a/lib/gitlab/email/hook/disable_email_interceptor.rb
+++ b/lib/gitlab/email/hook/disable_email_interceptor.rb
@@ -7,7 +7,7 @@ module Gitlab
def self.delivering_email(message)
message.perform_deliveries = false
- Rails.logger.info "Emails disabled! Interceptor prevented sending mail #{message.subject}"
+ Rails.logger.info "Emails disabled! Interceptor prevented sending mail #{message.subject}" # rubocop:disable Gitlab/RailsLogger
end
end
end