From 49f14f057d6deb0903ae4e9b876c89f717f85f10 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 29 Mar 2013 08:47:14 +0200
Subject: [PATCH] Prevent gollum to overrride gitlab-grit gem. Use grit as
instead so gollum uses it too. Fixes things with gpg singatured commits, etc.
---
Gemfile | 3 ++-
Gemfile.lock | 20 +++++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/Gemfile b/Gemfile
index 035942fabf1..a69a5c08780 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,8 @@ gem 'omniauth-twitter'
gem 'omniauth-github'
# Extracting information from a git repository
-gem "gitlab-grit", '~> 1.0.0', require: 'grit'
+# Since gollum requires grit we cannot use gitlab-grit gem name any more. Use grit instead
+gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: 'c40a32432616a07fa7fc3c32c24ab73ad6a9718f'
gem 'grit_ext', '~> 0.8.1'
# Ruby/Rack Git Smart-HTTP Server Handler
diff --git a/Gemfile.lock b/Gemfile.lock
index fca92716a95..44fe59a944e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,6 +6,16 @@ GIT
activerecord (>= 2.3.0)
rake (>= 0.8.7)
+GIT
+ remote: https://github.com/gitlabhq/grit.git
+ revision: c40a32432616a07fa7fc3c32c24ab73ad6a9718f
+ ref: c40a32432616a07fa7fc3c32c24ab73ad6a9718f
+ specs:
+ grit (2.5.0)
+ diff-lcs (~> 1.1)
+ mime-types (~> 1.15)
+ posix-spawn (~> 0.3.6)
+
GIT
remote: https://github.com/gitlabhq/raphael-rails.git
revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
@@ -166,10 +176,6 @@ GEM
github-markup (0.7.5)
gitlab-grack (1.0.0)
rack (~> 1.4.1)
- gitlab-grit (1.0.0)
- diff-lcs (~> 1.1)
- mime-types (~> 1.15)
- posix-spawn (~> 0.3.6)
gitlab-pygments.rb (0.3.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
@@ -194,10 +200,6 @@ GEM
grape-entity (0.2.0)
activesupport
multi_json (>= 1.3.2)
- grit (2.5.0)
- diff-lcs (~> 1.1)
- mime-types (~> 1.15)
- posix-spawn (~> 0.3.6)
grit_ext (0.8.1)
charlock_holmes (~> 0.6.9)
growl (1.0.3)
@@ -524,7 +526,6 @@ DEPENDENCIES
github-linguist (~> 2.3.4)
github-markup (~> 0.7.4)
gitlab-grack (~> 1.0.0)
- gitlab-grit (~> 1.0.0)
gitlab-pygments.rb (~> 0.3.2)
gitlab_meta (= 5.0)
gitlab_omniauth-ldap (= 1.0.2)
@@ -533,6 +534,7 @@ DEPENDENCIES
gon
grape (~> 0.3.1)
grape-entity (~> 0.2.0)
+ grit (~> 2.5.0)!
grit_ext (~> 0.8.1)
growl
guard-rspec
--
GitLab