Download as
Browse Code »

Commit 260c877cab3f4c1d05ab3d984a2fad5a1e018e5e

Authored by Dmitriy Zaporozhets
2 parents 10fad7b0 dc158af6
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'render_org_files' into 'master' 

Render org files

Fixes #1215
Showing 2 changed files with 5 additions and 0 deletions   Show diff stats
@@ -85,6 +85,7 @@ gem "seed-fu" @@ -85,6 +85,7 @@ gem "seed-fu"
85 # Markdown to HTML 85 # Markdown to HTML
86 gem "redcarpet", "~> 2.2.2" 86 gem "redcarpet", "~> 2.2.2"
87 gem "github-markup" 87 gem "github-markup"
  88 +gem "org-ruby" # For rendering .org files
88 89
89 # Diffs 90 # Diffs
90 gem 'diffy', '~> 3.0.3' 91 gem 'diffy', '~> 3.0.3'
@@ -319,6 +319,8 @@ GEM @@ -319,6 +319,8 @@ GEM
319 omniauth-twitter (1.0.1) 319 omniauth-twitter (1.0.1)
320 multi_json (~> 1.3) 320 multi_json (~> 1.3)
321 omniauth-oauth (~> 1.0) 321 omniauth-oauth (~> 1.0)
  322 + org-ruby (0.9.6)
  323 + rubypants (>= 0.2.0)
322 orm_adapter (0.5.0) 324 orm_adapter (0.5.0)
323 pg (0.15.1) 325 pg (0.15.1)
324 phantomjs (1.9.2.0) 326 phantomjs (1.9.2.0)
@@ -427,6 +429,7 @@ GEM @@ -427,6 +429,7 @@ GEM
427 rspec-mocks (~> 2.14.0) 429 rspec-mocks (~> 2.14.0)
428 ruby-progressbar (1.2.0) 430 ruby-progressbar (1.2.0)
429 rubyntlm (0.1.1) 431 rubyntlm (0.1.1)
  432 + rubypants (0.2.0)
430 rugged (0.19.0) 433 rugged (0.19.0)
431 safe_yaml (0.9.7) 434 safe_yaml (0.9.7)
432 sanitize (2.1.0) 435 sanitize (2.1.0)
@@ -625,6 +628,7 @@ DEPENDENCIES @@ -625,6 +628,7 @@ DEPENDENCIES
625 omniauth-github 628 omniauth-github
626 omniauth-google-oauth2 629 omniauth-google-oauth2
627 omniauth-twitter 630 omniauth-twitter
  631 + org-ruby
628 pg 632 pg
629 poltergeist (~> 1.4.1) 633 poltergeist (~> 1.4.1)
630 protected_attributes 634 protected_attributes