diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 19:43:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 19:43:42 +0000 |
| commit | 8f3fbbf0d56091ad87158f61bf2a4e96a7f937e3 (patch) | |
| tree | 6749b899adc622297e0443084ef6fd1909fffd00 /lib | |
| parent | de235133e1f8b318b0ee6f49269e576b6e969486 (diff) | |
| download | gitlab-ce-8f3fbbf0d56091ad87158f61bf2a4e96a7f937e3.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/error_tracking.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/error_tracking.rb b/lib/gitlab/error_tracking.rb index 38ac5d9af74..e91488c7c27 100644 --- a/lib/gitlab/error_tracking.rb +++ b/lib/gitlab/error_tracking.rb @@ -146,6 +146,9 @@ module Gitlab else inject_context_for_exception(event, ex.cause) if ex.cause.present? end + # This should only happen on PostgreSQL v12 queries + rescue PgQuery::ParseError + event.extra[:sql] = ex.sql.to_s end end end |