summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2015-05-13 01:40:11 +0200
committerJakub Jirutka <jakub@jirutka.cz>2015-05-18 22:51:56 +0200
commitdaa0925016a63dcde448643cbf1310aca359cf37 (patch)
tree6b8546fd4cdb2306dc40dec5e444b93d49b1d9de /app
parentb61a44fe1aa17a3e647e71115d1b4a6a39d8c2d2 (diff)
downloadgitlab-ce-daa0925016a63dcde448643cbf1310aca359cf37.tar.gz
Rename MarkdownHelper to MarkupHelper
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb6
-rw-r--r--app/helpers/blob_helper.rb2
-rw-r--r--app/models/tree.rb6
3 files changed, 7 insertions, 7 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bc07c09cd4a..5bcc0026016 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -233,15 +233,15 @@ module ApplicationHelper
end
def markup?(filename)
- Gitlab::MarkdownHelper.markup?(filename)
+ Gitlab::MarkupHelper.markup?(filename)
end
def gitlab_markdown?(filename)
- Gitlab::MarkdownHelper.gitlab_markdown?(filename)
+ Gitlab::MarkupHelper.gitlab_markdown?(filename)
end
def asciidoc?(filename)
- Gitlab::MarkdownHelper.asciidoc?(filename)
+ Gitlab::MarkupHelper.asciidoc?(filename)
end
# Overrides ActionView::Helpers::UrlHelper#link_to to add `rel="nofollow"` to
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 4ea838ca447..885ac5f85b8 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -55,7 +55,7 @@ module BlobHelper
end
def editing_preview_title(filename)
- if Gitlab::MarkdownHelper.previewable?(filename)
+ if Gitlab::MarkupHelper.previewable?(filename)
'Preview'
else
'Preview changes'
diff --git a/app/models/tree.rb b/app/models/tree.rb
index f279e896cda..93b3246a668 100644
--- a/app/models/tree.rb
+++ b/app/models/tree.rb
@@ -1,11 +1,11 @@
class Tree
- include Gitlab::MarkdownHelper
+ include Gitlab::MarkupHelper
attr_accessor :repository, :sha, :path, :entries
def initialize(repository, sha, path = '/')
path = '/' if path.blank?
-
+
@repository = repository
@sha = sha
@path = path
@@ -20,7 +20,7 @@ class Tree
available_readmes = blobs.select(&:readme?)
if available_readmes.count == 0
- return @readme = nil
+ return @readme = nil
end
# Take the first previewable readme, or the first available readme, if we