diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 12:08:32 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 12:08:32 +0000 |
| commit | c158fa8d69c704663d289341a014c44c062cda88 (patch) | |
| tree | d0cac82a9ac9e9ad28bb0030266eb8d5dc91fbbc /app/helpers/markup_helper.rb | |
| parent | b806264d29b8d52ccb78a41dcc3d67f2b040700c (diff) | |
| download | gitlab-ce-c158fa8d69c704663d289341a014c44c062cda88.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/markup_helper.rb')
| -rw-r--r-- | app/helpers/markup_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 719de095faf..d6e466d4678 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -154,7 +154,9 @@ module MarkupHelper else other_markup_unsafe(file_name, text, context) end - rescue RuntimeError + rescue StandardError => e + Gitlab::ErrorTracking.track_exception(e, project_id: @project&.id, file_name: file_name, context: context) + simple_format(text) end |