diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-02-13 20:50:19 +0300 |
---|---|---|
committer | Mark Fletcher <mark@gitlab.com> | 2018-02-13 21:23:36 +0300 |
commit | ed1c8857fecf50467a3466631140af31a28817cc (patch) | |
tree | 825d22a0ba3d944acbc6d6beb08e54eab0fd6fc5 /lib/gitlab | |
parent | 4c4b5f333e123e45d7433842505fc56e6c475445 (diff) |
Merge branch 'whitelisting' into 'master'
Remove Sentry reporting for query limiting
See merge request gitlab-org/gitlab-ce!17092
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/query_limiting/transaction.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/gitlab/query_limiting/transaction.rb b/lib/gitlab/query_limiting/transaction.rb index 3cbafadb0d0..66d7d9275cf 100644 --- a/lib/gitlab/query_limiting/transaction.rb +++ b/lib/gitlab/query_limiting/transaction.rb @@ -51,13 +51,7 @@ module Gitlab error = ThresholdExceededError.new(error_message) - if raise_error? - raise(error) - else - # Raven automatically logs to the Rails log if disabled, thus we don't - # need to manually log anything in case Sentry support is not enabled. - Raven.capture_exception(error) - end + raise(error) if raise_error? end def increment |