deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use latest gitlab-grit fork to prevent gollum override gitlab-grit. Fixes issues related to gpg signed commits and other fixes from gitlab/grit fork

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-30 13:14:19 +02:00
parent 65156e3693
commit 34136d381f
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -22,7 +22,8 @@ gem 'omniauth-twitter'
gem 'omniauth-github' gem 'omniauth-github'
# Extracting information from a git repository # 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: 'c15e2758ec75f99230cd0fbcc9110bf932c0bf05'
gem 'grit_ext', '~> 0.6.2' gem 'grit_ext', '~> 0.6.2'
# Ruby/Rack Git Smart-HTTP Server Handler # Ruby/Rack Git Smart-HTTP Server Handler

20
Gemfile.lock
View file

@ -23,6 +23,16 @@ GIT
activerecord (>= 2.3.0) activerecord (>= 2.3.0)
rake (>= 0.8.7) rake (>= 0.8.7)
GIT
remote: https://github.com/gitlabhq/grit.git
revision: c15e2758ec75f99230cd0fbcc9110bf932c0bf05
ref: c15e2758ec75f99230cd0fbcc9110bf932c0bf05
specs:
grit (2.5.0)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
GIT GIT
remote: https://github.com/gitlabhq/raphael-rails.git remote: https://github.com/gitlabhq/raphael-rails.git
revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58 revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
@ -166,10 +176,6 @@ GEM
github-markup (0.7.5) github-markup (0.7.5)
gitlab-grack (1.0.0) gitlab-grack (1.0.0)
rack (~> 1.4.1) 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) gitlab-pygments.rb (0.3.2)
posix-spawn (~> 0.3.6) posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0) yajl-ruby (~> 1.1.0)
@ -194,10 +200,6 @@ GEM
grape-entity (0.2.0) grape-entity (0.2.0)
activesupport activesupport
multi_json (>= 1.3.2) 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.6.2) grit_ext (0.6.2)
charlock_holmes (~> 0.6.9) charlock_holmes (~> 0.6.9)
growl (1.0.3) growl (1.0.3)
@ -521,7 +523,6 @@ DEPENDENCIES
github-linguist (~> 2.3.4) github-linguist (~> 2.3.4)
github-markup (~> 0.7.4) github-markup (~> 0.7.4)
gitlab-grack (~> 1.0.0) gitlab-grack (~> 1.0.0)
gitlab-grit (~> 1.0.0)
gitlab-pygments.rb (~> 0.3.2) gitlab-pygments.rb (~> 0.3.2)
gitlab_meta (= 5.0) gitlab_meta (= 5.0)
gitlab_omniauth-ldap (= 1.0.2) gitlab_omniauth-ldap (= 1.0.2)
@ -530,6 +531,7 @@ DEPENDENCIES
gon gon
grape (~> 0.3.1) grape (~> 0.3.1)
grape-entity (~> 0.2.0) grape-entity (~> 0.2.0)
grit (~> 2.5.0)!
grit_ext (~> 0.6.2) grit_ext (~> 0.6.2)
growl growl
guard-rspec guard-rspec