Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 1 deletions

diff --git a/app/presenters/blob_presenter.rb b/app/presenters/blob_presenter.rb
index e703b9d79bb..e8261e6f8df 100644
--- a/app/presenters/blob_presenter.rb
+++ b/app/presenters/blob_presenter.rb
@@ -27,7 +27,7 @@ class BlobPresenter < Gitlab::View::Presenter::Delegated
     Gitlab::Highlight.highlight(
       blob.path,
       transformed_blob_data,
-      language: language,
+      language: transformed_blob_language,
       plain: plain
     )
   end
@@ -120,6 +120,10 @@ class BlobPresenter < Gitlab::View::Presenter::Delegated
     blob.language_from_gitattributes
   end
 
+  def transformed_blob_language
+    @transformed_blob_language ||= blob.path.ends_with?('.ipynb') ? 'md' : language
+  end
+
   def transformed_blob_data
     @transformed_blob ||= if blob.path.ends_with?('.ipynb')
                             new_blob = IpynbDiff.transform(blob.data,