Skip to content

Commit 598d028

Browse files
author
Tim Vandecasteele
committed
Revert Merge pull request #84 from MongoHQ/gfm
Compatibility with jruby was lost.
1 parent e4cdbdd commit 598d028

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "http://rubygems.org"
55

66
gem 'grape', '>= 0.2.0'
77
gem 'grape-entity', '>= 0.3.0'
8-
gem 'github-markdown'
8+
gem 'kramdown'
99

1010
# Add dependencies to develop your gem here.
1111
# Include everything needed to run rake, tests, features, etc.

Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ GEM
1111
diff-lcs (1.1.3)
1212
ffi (1.9.3-java)
1313
git (1.2.5)
14-
github-markdown (0.6.4)
1514
grape (0.5.0)
1615
activesupport
1716
builder
@@ -34,6 +33,7 @@ GEM
3433
rdoc
3534
json (1.7.3)
3635
json (1.7.3-java)
36+
kramdown (0.13.7)
3737
method_source (0.8)
3838
multi_json (1.7.7)
3939
multi_xml (0.5.4)
@@ -83,10 +83,10 @@ PLATFORMS
8383

8484
DEPENDENCIES
8585
bundler (> 1.0.0)
86-
github-markdown
8786
grape (>= 0.2.0)
8887
grape-entity (>= 0.3.0)
8988
jeweler (~> 1.8.4)
89+
kramdown
9090
pry
9191
rack-test
9292
rdoc (~> 3.12)

lib/grape-swagger.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'github/markdown'
1+
require 'kramdown'
22

33
module Grape
44
class API
@@ -182,7 +182,7 @@ def self.setup(options)
182182
helpers do
183183

184184
def as_markdown(description)
185-
description && @@markdown ? GitHub::Markdown.render_gfm(strip_heredoc(description)) : description
185+
description && @@markdown ? Kramdown::Document.new(strip_heredoc(description)).to_html : description
186186
end
187187

188188
def parse_params(params, path, method)

0 commit comments

Comments
 (0)