Download as
Browse Code »

Commit 075650fc6b269decd5691aa4fe669ebad3800f48

Authored by Dmitriy Zaporozhets
2 parents 4bf446cb 4d0ce5e8
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'bug/500_on_rdoc_readme' of /home/git/repositories/gitlab/gitlabhq

Showing 2 changed files with 9 additions and 3 deletions   Show diff stats
Gemfile
  Diff comments   View file @075650f
... ... @@ -79,7 +79,7 @@ gem "seed-fu"
79 79  
80 80 # Markdown to HTML
81 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 84 # Asciidoc to HTML
85 85 gem "asciidoctor"
... ...
Gemfile.lock
  Diff comments   View file @075650f
... ... @@ -7,6 +7,13 @@ GIT
7 7 actionpack (>= 2.3.0)
8 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 17 GEM
11 18 remote: https://rubygems.org/
12 19 specs:
... ... @@ -168,7 +175,6 @@ GEM
168 175 gherkin-ruby (0.3.1)
169 176 racc
170 177 github-markdown (0.5.5)
171   - github-markup (0.7.5)
172 178 gitlab-flowdock-git-hook (0.4.2.2)
173 179 gitlab-grit (>= 2.4.1)
174 180 multi_json
... ... @@ -588,7 +594,7 @@ DEPENDENCIES
588 594 font-awesome-rails (~> 3.2)
589 595 foreman
590 596 gemoji (~> 1.3.0)
591   - github-markup (~> 0.7.4)
  597 + github-markup (~> 0.7.4)!
592 598 gitlab-flowdock-git-hook (~> 0.4.2)
593 599 gitlab-gollum-lib (~> 1.0.2)
594 600 gitlab-grack (~> 2.0.0.pre)
... ...