Merge branch 'ipython-notebook-viewer-improvements' into 'master'

Added worksheets support to notebook viewer See merge request !10307

Merge branch 'ipython-notebook-viewer-improvements' into 'master'
Added worksheets support to notebook viewer See merge request !10307
ecfbfbf4 · Jacob Schatz · 024d8be0 · c71831e8 · ecfbfbf4 · ecfbfbf4
Commit ecfbfbf4 authored Mar 30, 2017 by Jacob Schatz
Show whitespace changes
Inline Side-by-side

Showing with 4606 additions and 4589 deletions

app/models/blob.rb app/models/blob.rb +1 -1

vendor/assets/javascripts/notebooklab.js vendor/assets/javascripts/notebooklab.js +4605 -4588

No files found.
--- a/app/models/blob.rb
+++ b/app/models/blob.rb
@@ -47,7 +47,7 @@ class Blob < SimpleDelegator
  end

  def ipython_notebook?
-    text? && language && language.name == 'Jupyter Notebook'
+    text? && language&.name == 'Jupyter Notebook'
  end

  def size_within_svg_limits?

--- a/vendor/assets/javascripts/notebooklab.js
+++ b/vendor/assets/javascripts/notebooklab.js