Fix snippet render issue cause of haml preserve

diff --git a/app/views/snippets/_blob.html.haml b/app/views/snippets/_blob.html.haml
new file mode 100644 (file)
index 0000000..68a5f2b
--- /dev/null
+++ b/app/views/snippets/_blob.html.haml
@@ -0,0 +1,13 @@
+.file_holder
+  .file_title
+    %i.icon-file
+    %strong= @snippet.file_name
+    %span.options
+      = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn very_small", target: "_blank"
+  .file_content.code
+    - unless @snippet.content.empty?
+      %div{class: current_user.dark_scheme ? "black" : "white"}
+        :preserve
+          #{raw @snippet.colorize(formatter: :gitlab)}
+    - else
+      %p.nothing_here_message Empty file

diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 955b4e1..f3e0192 100644 (file)
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -7,24 +7,5 @@
     = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn small right"
 
 %br
-
-%div
-  .file_holder
-    .file_title
-      %i.icon-file
-      %strong= @snippet.file_name
-      %span.options
-        = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn very_small", target: "_blank"
-    .file_content.code
-      - unless @snippet.content.empty?
-        %div{class: current_user.dark_scheme ? "black" : "white"}
-          = preserve do
-            = raw Pygments.highlight(@snippet.content, formatter: :gitlab)
-      - else
-        %h4.nothing_here_message Empty file
-
-
-.clearfix
-
-%div#notes
-  = render "notes/notes_with_form", tid: @snippet.id, tt: "snippet"
+%div= render 'blob'
+%div#notes= render "notes/notes_with_form", tid: @snippet.id, tt: "snippet"

diff --git a/app/views/tree/blob/_text.html.haml b/app/views/tree/blob/_text.html.haml
index 9e0f4bc..37b0ff8 100644 (file)
--- a/app/views/tree/blob/_text.html.haml
+++ b/app/views/tree/blob/_text.html.haml
@@ -12,4 +12,4 @@
         = preserve do
           = raw blob.colorize(formatter: :gitlab)
     - else
-      %h4.nothing_here_message Empty file
+      %p.nothing_here_message Empty file