Download as
Browse Code »

Commit 4d0ce5e85be98960584d6a6e78399f623b55eafd

Authored by Dmitriy Zaporozhets
1 parent 231b91d0
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Fix 500 for rdoc files 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 9 additions and 3 deletions   Show diff stats
@@ -79,7 +79,7 @@ gem &quot;seed-fu&quot; @@ -79,7 +79,7 @@ gem &quot;seed-fu&quot;
79 79
80 # Markdown to HTML 80 # Markdown to HTML
81 gem "redcarpet", "~> 2.2.2" 81 gem "redcarpet", "~> 2.2.2"
82 -gem "github-markup", "~> 0.7.4", require: 'github/markup' 82 +gem "github-markup", "~> 0.7.4", require: 'github/markup', git: 'https://github.com/gitlabhq/markup.git', ref: '61ade389c1e1c159359338f570d18464a44ddbc4'
83 83
84 # Asciidoc to HTML 84 # Asciidoc to HTML
85 gem "asciidoctor" 85 gem "asciidoctor"
@@ -7,6 +7,13 @@ GIT @@ -7,6 +7,13 @@ GIT
7 actionpack (>= 2.3.0) 7 actionpack (>= 2.3.0)
8 json 8 json
9 9
  10 +GIT
  11 + remote: https://github.com/gitlabhq/markup.git
  12 + revision: 61ade389c1e1c159359338f570d18464a44ddbc4
  13 + ref: 61ade389c1e1c159359338f570d18464a44ddbc4
  14 + specs:
  15 + github-markup (0.7.6)
  16 +
10 GEM 17 GEM
11 remote: https://rubygems.org/ 18 remote: https://rubygems.org/
12 specs: 19 specs:
@@ -168,7 +175,6 @@ GEM @@ -168,7 +175,6 @@ GEM
168 gherkin-ruby (0.3.1) 175 gherkin-ruby (0.3.1)
169 racc 176 racc
170 github-markdown (0.5.5) 177 github-markdown (0.5.5)
171 - github-markup (0.7.5)  
172 gitlab-flowdock-git-hook (0.4.2.2) 178 gitlab-flowdock-git-hook (0.4.2.2)
173 gitlab-grit (>= 2.4.1) 179 gitlab-grit (>= 2.4.1)
174 multi_json 180 multi_json
@@ -588,7 +594,7 @@ DEPENDENCIES @@ -588,7 +594,7 @@ DEPENDENCIES
588 font-awesome-rails (~> 3.2) 594 font-awesome-rails (~> 3.2)
589 foreman 595 foreman
590 gemoji (~> 1.3.0) 596 gemoji (~> 1.3.0)
591 - github-markup (~> 0.7.4) 597 + github-markup (~> 0.7.4)!
592 gitlab-flowdock-git-hook (~> 0.4.2) 598 gitlab-flowdock-git-hook (~> 0.4.2)
593 gitlab-gollum-lib (~> 1.0.2) 599 gitlab-gollum-lib (~> 1.0.2)
594 gitlab-grack (~> 2.0.0.pre) 600 gitlab-grack (~> 2.0.0.pre)