diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-15 16:55:07 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-15 16:55:07 +0200 |
| commit | 71ab011a1711db9a1a9ced2c2c92c8427ae6f624 (patch) | |
| tree | 95e38662d7f022061c2c809f4b6c53067a5df468 /Gemfile | |
| parent | 4f23c30ace844cdcd2c59da1a758c8a6788ca6f3 (diff) | |
| parent | d69a37e0b7163f5a03fcc58fdb6ec0ed1eb20862 (diff) | |
| download | gitlab-ce-71ab011a1711db9a1a9ced2c2c92c8427ae6f624.tar.gz | |
Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis
Conflicts:
app/views/layouts/project_resource.html.haml
app/views/wikis/edit.html.haml
app/views/wikis/pages.html.haml
app/views/wikis/show.html.haml
spec/features/gitlab_flavored_markdown_spec.rb
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -99,6 +99,13 @@ gem "colored" # GitLab settings gem 'settingslogic' +# Wiki +# - Use latest master to resolve Gem dependency with Pygemnts +# github-linquist needs pygments 0.4.2 but Gollum 2.4.11 +# requires pygments 0.3.2. The latest master Gollum has been updated +# to use pygments 0.4.2. Change this after next Gollum release. +gem "gollum", "~> 2.4.0", git: "git://github.com/github/gollum.git" + # Misc gem "foreman" gem "git" |