Move calls to Gitlab::MarkdownHelper to application_helper

6 files changed, 21 insertions, 13 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ce1d0538b83..cc49b89191b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -226,6 +226,14 @@ module ApplicationHelper
     simple_format(file_content)
   end
 
+  def markup?(filename)
+    Gitlab::MarkdownHelper.markup?(filename)
+  end
+
+  def gitlab_markdown?(filename)
+    Gitlab::MarkdownHelper.gitlab_markdown?(filename)
+  end
+
   def spinner(text = nil, visible = false)
     css_class = "loading"
     css_class << " hide" unless visible
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index c36d0cf46e7..d815257a4e3 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -22,9 +22,9 @@ module TreeHelper
   end
 
   def render_readme(readme)
-    if Gitlab::MarkdownHelper.gitlab_markdown?(readme.name)
+    if gitlab_markdown?(readme.name)
       preserve(markdown(readme.data))
-    elsif Gitlab::MarkdownHelper.markup?(readme.name)
+    elsif markup?(readme.name)
       render_markup(readme.name, readme.data)
     else
       simple_format(readme.data)
@@ -90,8 +90,7 @@ module TreeHelper
   end
 
   def editing_preview_title(filename)
-    if Gitlab::MarkdownHelper.gitlab_markdown?(filename) ||
-       Gitlab::MarkdownHelper.markup?(filename)
+    if gitlab_markdown?(filename) || markup?(filename)
       'Preview'
     else
       'Diff'
diff --git a/app/models/tree.rb b/app/models/tree.rb
index 5bb1f3cdaf4..07c9a825e24 100644
--- a/app/models/tree.rb
+++ b/app/models/tree.rb
@@ -1,4 +1,6 @@
 class Tree
+  include Gitlab::MarkdownHelper
+
   attr_accessor :entries, :readme, :contribution_guide
 
   def initialize(repository, sha, path = '/')
@@ -13,8 +15,7 @@ class Tree
       # by markup renderer.
       if available_readmes.length > 1
         supported_readmes = available_readmes.select do |readme|
-          Gitlab::MarkdownHelper.gitlab_markdown?(readme.name) ||
-          Gitlab::MarkdownHelper.markup?(readme.name)
+          gitlab_markdown?(readme.name) || markup?(readme.name)
         end
 
         # Take the first supported readme, or the first available readme, if we
diff --git a/app/views/projects/blob/_text.html.haml b/app/views/projects/blob/_text.html.haml
index fb6af1127f8..7cbea7c3eb6 100644
--- a/app/views/projects/blob/_text.html.haml
+++ b/app/views/projects/blob/_text.html.haml
@@ -1,8 +1,8 @@
-- if Gitlab::MarkdownHelper.gitlab_markdown?(blob.name)
+- if gitlab_markdown?(blob.name)
   .file-content.wiki
     = preserve do
       = markdown(blob.data)
-- elsif Gitlab::MarkdownHelper.markup?(blob.name)
+- elsif markup?(blob.name)
   .file-content.wiki
     = render_markup(blob.name, blob.data)
 - else
diff --git a/app/views/projects/edit_tree/preview.html.haml b/app/views/projects/edit_tree/preview.html.haml
index 65ceafbba86..87ce5dc31d3 100644
--- a/app/views/projects/edit_tree/preview.html.haml
+++ b/app/views/projects/edit_tree/preview.html.haml
@@ -1,12 +1,12 @@
 .diff-file
   .diff-content
-    - if Gitlab::MarkdownHelper.gitlab_markdown?(@blob.name)
+    - if gitlab_markdown?(@blob.name)
       .file-content.wiki
         = preserve do
           = markdown(@content)
-    - elsif Gitlab::MarkdownHelper.markup?(@blob.name)
+    - elsif markup?(@blob.name)
       .file-content.wiki
-        = raw GitHub::Markup.render(@blob.name, @content)
+        = raw render_markup(@blob.name, @content)
     - else
       .file-content.code
         - unless @diff.empty?
diff --git a/app/views/shared/snippets/_blob.html.haml b/app/views/shared/snippets/_blob.html.haml
index 90c096dda22..8cec6168ab8 100644
--- a/app/views/shared/snippets/_blob.html.haml
+++ b/app/views/shared/snippets/_blob.html.haml
@@ -1,9 +1,9 @@
 - unless @snippet.content.empty?
-  - if Gitlab::MarkdownHelper.gitlab_markdown?(@snippet.file_name)
+  - if gitlab_markdown?(@snippet.file_name)
     .file-content.wiki
       = preserve do
         = markdown(@snippet.data)
-  - elsif Gitlab::MarkdownHelper.markup?(@snippet.file_name)
+  - elsif markup?(@snippet.file_name)
     .file-content.wiki
       = render_markup(@snippet.file_name, @snippet.data)
   - else