Updated gems. Replaced gollum with gollum-lib

2 files changed, 15 insertions, 33 deletions

diff --git a/Gemfile b/Gemfile
index c63706b346e..71ac795772a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -91,16 +91,11 @@ 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: "https://github.com/gollum/gollum.git", ref: "5dcd3c8c8f"
+# Git Wiki
+gem "gollum-lib", "~> 1.0.0"
 
 # Misc
 gem "foreman"
-gem "git"
 
 # Cache
 gem "redis-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index 97f0a2839d3..c8d75f9dc89 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,23 +23,6 @@ GIT
     raphael-rails (2.1.0)
 
 GIT
-  remote: https://github.com/gollum/gollum.git
-  revision: 5dcd3c8c8f68158e43ff79861279088ee56d0ebe
-  ref: 5dcd3c8c8f
-  specs:
-    gollum (2.4.11)
-      github-markdown (~> 0.5.3)
-      github-markup (>= 0.7.5, < 1.0.0)
-      grit (~> 2.5.0)
-      mustache (>= 0.99.4, < 1.0.0)
-      nokogiri (~> 1.5.6)
-      pygments.rb (~> 0.4.2)
-      sanitize (~> 2.0.3)
-      sinatra (~> 1.3.5)
-      stringex (~> 1.5.1)
-      useragent (~> 0.4.16)
-
-GIT
   remote: https://github.com/jonleighton/poltergeist.git
   revision: 9645b52009e258921b860d3b7601d00008b22c45
   ref: 9645b52009e258921b860d3b7601d00008b22c45
@@ -162,14 +145,13 @@ GEM
       eventmachine (>= 0.12.0)
     ffaker (1.15.0)
     ffi (1.6.0)
-    font-awesome-sass-rails (3.0.0.1)
+    font-awesome-sass-rails (3.0.2.2)
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
-    foreman (0.61.0)
+    foreman (0.62.0)
       thor (>= 0.13.6)
     gemoji (1.2.1)
     gherkin-ruby (0.2.1)
-    git (1.2.5)
     github-linguist (2.3.4)
       charlock_holmes (~> 0.6.6)
       escape_utils (~> 0.2.3)
@@ -188,6 +170,14 @@ GEM
       omniauth (~> 1.0)
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.1.1)
+    gollum-lib (1.0.0)
+      github-markdown (~> 0.5.3)
+      github-markup (>= 0.7.5, < 1.0.0)
+      grit (~> 2.5.0)
+      nokogiri (~> 1.5.9)
+      pygments.rb (~> 0.4.2)
+      sanitize (~> 2.0.3)
+      stringex (~> 1.5.1)
     gon (4.0.2)
     grape (0.3.2)
       activesupport
@@ -264,7 +254,6 @@ GEM
     multi_json (1.7.2)
     multi_xml (0.5.3)
     multipart-post (1.1.5)
-    mustache (0.99.4)
     mysql2 (0.3.11)
     net-ldap (0.2.2)
     nokogiri (1.5.9)
@@ -318,7 +307,7 @@ GEM
       rack (>= 1.1.3)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-protection (1.4.0)
+    rack-protection (1.5.0)
       rack
     rack-ssl (1.3.3)
       rack
@@ -426,7 +415,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.5)
+    sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
@@ -471,7 +460,6 @@ GEM
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    useragent (0.4.16)
     virtus (0.5.4)
       backports (~> 2.6.1)
       descendants_tracker (~> 0.0.1)
@@ -509,14 +497,13 @@ DEPENDENCIES
   font-awesome-sass-rails (~> 3.0.0)
   foreman
   gemoji (~> 1.2.1)
-  git
   github-linguist (~> 2.3.4)
   github-markup (~> 0.7.4)
   gitlab-grack (~> 1.0.0)
   gitlab-pygments.rb (~> 0.3.2)
   gitlab_meta (= 5.0)
   gitlab_omniauth-ldap (= 1.0.2)
-  gollum (~> 2.4.0)!
+  gollum-lib (~> 1.0.0)
   gon
   grape (~> 0.3.1)
   grape-entity (~> 0.2.0)