diff options
| author | Alex Hanselka <alex@gitlab.com> | 2018-12-11 00:42:50 +0300 |
|---|---|---|
| committer | Alex Hanselka <alex@gitlab.com> | 2018-12-11 00:42:50 +0300 |
| commit | f77888fe0857c9f4a47133f434c741a510946767 (patch) | |
| tree | b227b60894474ba2c9a8864b66e4df65763b35b8 /lib/api/helpers.rb | |
| parent | d2120ff1e705799752e7d9704cae3f1896d8e186 (diff) | |
| parent | 2d7dc668506a0576e231fbe290c89e47cf088300 (diff) | |
Merge branch '11-6-stable-prepare-rc5' into '11-6-stable'
Prepare 11.6 RC5 release
See merge request gitlab-org/gitlab-ce!23704
Diffstat (limited to 'lib/api/helpers.rb')
| -rw-r--r-- | lib/api/helpers.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 9fda73d5b92..2cceb2ec798 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -368,10 +368,10 @@ module API end def handle_api_exception(exception) - if sentry_enabled? && report_exception?(exception) + if report_exception?(exception) define_params_for_grape_middleware - sentry_context - Raven.capture_exception(exception, extra: params) + Gitlab::Sentry.context(current_user) + Gitlab::Sentry.track_acceptable_exception(exception, extra: params) end # lifted from https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb#L60 |