diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-29 14:17:13 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-29 14:17:13 +0200 |
| commit | 4d0ce5e85be98960584d6a6e78399f623b55eafd (patch) | |
| tree | d6de6f80e039f5bfbdcb0ac34224740d9c0a0b08 /Gemfile.lock | |
| parent | 231b91d0c819ef1e4fb1beb23c5decfa34876ec6 (diff) | |
| download | gitlab-ce-4d0ce5e85be98960584d6a6e78399f623b55eafd.tar.gz | |
Fix 500 for rdoc files
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2c29f1a9b31..7948f3fb5bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,6 +7,13 @@ GIT actionpack (>= 2.3.0) json +GIT + remote: https://github.com/gitlabhq/markup.git + revision: 61ade389c1e1c159359338f570d18464a44ddbc4 + ref: 61ade389c1e1c159359338f570d18464a44ddbc4 + specs: + github-markup (0.7.6) + GEM remote: https://rubygems.org/ specs: @@ -168,7 +175,6 @@ GEM gherkin-ruby (0.3.1) racc github-markdown (0.5.5) - github-markup (0.7.5) gitlab-flowdock-git-hook (0.4.2.2) gitlab-grit (>= 2.4.1) multi_json @@ -588,7 +594,7 @@ DEPENDENCIES font-awesome-rails (~> 3.2) foreman gemoji (~> 1.3.0) - github-markup (~> 0.7.4) + github-markup (~> 0.7.4)! gitlab-flowdock-git-hook (~> 0.4.2) gitlab-gollum-lib (~> 1.0.2) gitlab-grack (~> 2.0.0.pre) |