Move some methods from ApplicationHelper to MarkupHelper
This commit is contained in:
parent
d95bffc6da
commit
ef4d4446e9
|
@ -196,38 +196,6 @@ module ApplicationHelper
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_markup(file_name, file_content)
|
|
||||||
if gitlab_markdown?(file_name)
|
|
||||||
Hamlit::RailsHelpers.preserve(markdown(file_content))
|
|
||||||
elsif asciidoc?(file_name)
|
|
||||||
asciidoc(file_content)
|
|
||||||
elsif plain?(file_name)
|
|
||||||
content_tag :pre, class: 'plain-readme' do
|
|
||||||
file_content
|
|
||||||
end
|
|
||||||
else
|
|
||||||
other_markup(file_name, file_content)
|
|
||||||
end
|
|
||||||
rescue RuntimeError
|
|
||||||
simple_format(file_content)
|
|
||||||
end
|
|
||||||
|
|
||||||
def plain?(filename)
|
|
||||||
Gitlab::MarkupHelper.plain?(filename)
|
|
||||||
end
|
|
||||||
|
|
||||||
def markup?(filename)
|
|
||||||
Gitlab::MarkupHelper.markup?(filename)
|
|
||||||
end
|
|
||||||
|
|
||||||
def gitlab_markdown?(filename)
|
|
||||||
Gitlab::MarkupHelper.gitlab_markdown?(filename)
|
|
||||||
end
|
|
||||||
|
|
||||||
def asciidoc?(filename)
|
|
||||||
Gitlab::MarkupHelper.asciidoc?(filename)
|
|
||||||
end
|
|
||||||
|
|
||||||
def promo_host
|
def promo_host
|
||||||
'about.gitlab.com'
|
'about.gitlab.com'
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,22 @@
|
||||||
require 'nokogiri'
|
require 'nokogiri'
|
||||||
|
|
||||||
module MarkupHelper
|
module MarkupHelper
|
||||||
|
def plain?(filename)
|
||||||
|
Gitlab::MarkupHelper.plain?(filename)
|
||||||
|
end
|
||||||
|
|
||||||
|
def markup?(filename)
|
||||||
|
Gitlab::MarkupHelper.markup?(filename)
|
||||||
|
end
|
||||||
|
|
||||||
|
def gitlab_markdown?(filename)
|
||||||
|
Gitlab::MarkupHelper.gitlab_markdown?(filename)
|
||||||
|
end
|
||||||
|
|
||||||
|
def asciidoc?(filename)
|
||||||
|
Gitlab::MarkupHelper.asciidoc?(filename)
|
||||||
|
end
|
||||||
|
|
||||||
# Use this in places where you would normally use link_to(gfm(...), ...).
|
# Use this in places where you would normally use link_to(gfm(...), ...).
|
||||||
#
|
#
|
||||||
# It solves a problem occurring with nested links (i.e.
|
# It solves a problem occurring with nested links (i.e.
|
||||||
|
@ -110,6 +126,22 @@ module MarkupHelper
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def render_markup(file_name, file_content)
|
||||||
|
if gitlab_markdown?(file_name)
|
||||||
|
Hamlit::RailsHelpers.preserve(markdown(file_content))
|
||||||
|
elsif asciidoc?(file_name)
|
||||||
|
asciidoc(file_content)
|
||||||
|
elsif plain?(file_name)
|
||||||
|
content_tag :pre, class: 'plain-readme' do
|
||||||
|
file_content
|
||||||
|
end
|
||||||
|
else
|
||||||
|
other_markup(file_name, file_content)
|
||||||
|
end
|
||||||
|
rescue RuntimeError
|
||||||
|
simple_format(file_content)
|
||||||
|
end
|
||||||
|
|
||||||
# Returns the text necessary to reference `entity` across projects
|
# Returns the text necessary to reference `entity` across projects
|
||||||
#
|
#
|
||||||
# project - Project to reference
|
# project - Project to reference
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe MarkupHelper do
|
describe MarkupHelper do
|
||||||
include ApplicationHelper
|
|
||||||
|
|
||||||
let!(:project) { create(:project, :repository) }
|
let!(:project) { create(:project, :repository) }
|
||||||
|
|
||||||
let(:user) { create(:user, username: 'gfm') }
|
let(:user) { create(:user, username: 'gfm') }
|
||||||
|
|
Loading…
Reference in New Issue