Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 'redcarpet' gem conflict and Markdown name clash within Redmine 2.6 #37

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix 'redcarpet' gem conflict and Markdown name clash within Redmine 2.6 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Gemfile
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions init.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

require 'redmine'
require 'redmine/wiki_formatting/markdown/formatter'
require 'redmine/wiki_formatting/markdown/helper'
require 'redmine/wiki_formatting/redcarpet_markdown/formatter'
require 'redmine/wiki_formatting/redcarpet_markdown/helper'


Redmine::Plugin.register :redmine_redcarpet_formatter do
Expand All @@ -26,7 +26,7 @@
description 'Markdown wiki formatting by Redcarpet for Redmine'
version '2.1'

wiki_format_provider 'markdown', Redmine::WikiFormatting::Markdown::Formatter, Redmine::WikiFormatting::Markdown::Helper
wiki_format_provider 'redcarpet_markdown', Redmine::WikiFormatting::RedcarpetMarkdown::Formatter, Redmine::WikiFormatting::RedcarpetMarkdown::Helper

settings :default => {
'enable_hardwrap' => '1',
Expand Down
2 changes: 1 addition & 1 deletion ...ine/wiki_formatting/markdown/formatter.rb → ...ormatting/redcarpet_markdown/formatter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def normal_text(text)

module Redmine
module WikiFormatting
module Markdown
module RedcarpetMarkdown
class Formatter
# include ActionView::Helpers::TagHelper

Expand Down
2 changes: 1 addition & 1 deletion ...edmine/wiki_formatting/markdown/helper.rb → ...i_formatting/redcarpet_markdown/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
module Redmine
module WikiFormatting

module Markdown
module RedcarpetMarkdown
module Helper
unloadable

Expand Down