Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Knox <dknox@threedotloft.com>2013-03-04 07:43:52 +0400
committerDan Knox <dknox@threedotloft.com>2013-03-10 04:39:51 +0400
commitea9b3687db46bf876a6f966e61bfddc1e6d25ef3 (patch)
treeef3804fa0b37949aef1d823b794e9ae7ba41044e /Gemfile
parent8e8372d5ce75713aa1452d7c818724dcbca72e53 (diff)
Replace current Wiki system with Gollum Wikis.
This commit replaces the old database backed Wiki system with the excellent Gollum git based Wiki system. The UI has been updated to allow for utilizing the extra features that Gollum provides. Specifically: * Edit page now allows you to choose the content format. * Edit page allows you to provide a commit message for the change. * History page now shows Format, Commit Message, and Commit Hash. * A new Git Access page has been added with the Wiki Repo URL. * The default page has been changed to Home from Index to match the Gollum standard. The old Wiki model has been left in tact to provide for the development of a migration script that will move all content stored in the old Wiki system into new Gollum Wikis.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile7
1 files changed, 7 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 324e1ce2c1b..a532a7dcfe2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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"