Merge branch '34729-blob' into 'master'

snippet has a blob, but isn't a blob Closes #34729 See merge request !12792

Merge branch '34729-blob' into 'master'
b957f79d · Douwe Maan · 7a938e67 · e0f4a63e · b957f79d · b957f79d
Commit b957f79d authored Jul 11, 2017 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

ui.html.haml app/views/help/ui.html.haml +1 -1

34729-blob.yml changelogs/unreleased/34729-blob.yml +4 -0

No files found.
--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
@@ -525,7 +525,7 @@
  %h4
    %code .file-holder

-  - blob = Snippet.new(content: "Wow\nSuch\nFile")
+  - blob = Snippet.new(content: "Wow\nSuch\nFile").blob
  .example
    .file-holder
      .js-file-title.file-title

--- a/changelogs/unreleased/34729-blob.yml
+++ b/changelogs/unreleased/34729-blob.yml
+---
+title: Fix crash on /help/ui
+merge_request:
+author: