Commit 85b7c4ac authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch...

Merge branch '345504-bug-ipynbdiff-invalidnotebookerror-ipynbdiff-invalidnotebookerror' into 'master'

Resolve "[BUG] IpynbDiff::InvalidNotebookError: IpynbDiff::InvalidNotebookError"

See merge request gitlab-org/gitlab!74308
parents 356559d1 0353dab5
...@@ -137,7 +137,7 @@ class BlobPresenter < Gitlab::View::Presenter::Delegated ...@@ -137,7 +137,7 @@ class BlobPresenter < Gitlab::View::Presenter::Delegated
@transformed_blob ||= blob.data @transformed_blob ||= blob.data
rescue IpynbDiff::InvalidNotebookError => e rescue IpynbDiff::InvalidNotebookError => e
Gitlab::ErrorTracking.track_exception(e, issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/344676') Gitlab::ErrorTracking.log_exception(e)
blob.data blob.data
end end
end end
...@@ -470,7 +470,7 @@ module Gitlab ...@@ -470,7 +470,7 @@ module Gitlab
Gitlab::AppLogger.info({ message: new_diff ? 'IPYNB_DIFF_GENERATED' : 'IPYNB_DIFF_NIL' }) Gitlab::AppLogger.info({ message: new_diff ? 'IPYNB_DIFF_GENERATED' : 'IPYNB_DIFF_NIL' })
rescue IpynbDiff::InvalidNotebookError => e rescue IpynbDiff::InvalidNotebookError => e
Gitlab::ErrorTracking.track_exception(e, issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/344676') Gitlab::ErrorTracking.log_exception(e)
end end
def strip_diff_frontmatter(diff_content) def strip_diff_frontmatter(diff_content)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment