diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-07-11 18:22:26 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-11 18:22:26 +0000 |
| commit | b957f79de5a058d178a7aa405183d080f9fefc6f (patch) | |
| tree | 987fdd185a6bd976fb572b24e1400125ab6ee6d3 | |
| parent | 7a938e67c4ea3464d1d2603cab382e0ce3ab9d56 (diff) | |
| parent | e0f4a63ecebdaf4330b7de98b9184055f7a8ec61 (diff) | |
| download | gitlab-ce-b957f79de5a058d178a7aa405183d080f9fefc6f.tar.gz | |
Merge branch '34729-blob' into 'master'
snippet has a blob, but isn't a blob
Closes #34729
See merge request !12792
| -rw-r--r-- | app/views/help/ui.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/34729-blob.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 615dd56afbd..48edbb8c16f 100644 --- 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 diff --git a/changelogs/unreleased/34729-blob.yml b/changelogs/unreleased/34729-blob.yml new file mode 100644 index 00000000000..15a469d3af0 --- /dev/null +++ b/changelogs/unreleased/34729-blob.yml @@ -0,0 +1,4 @@ +--- +title: Fix crash on /help/ui +merge_request: +author: |