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

use grit_ext gem instead of fork

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-04 08:56:54 +02:00
parent d199de0444
commit 152c6018b3
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -23,12 +23,11 @@ gem 'omniauth-github'
# Extracting information from a git repository # Extracting information from a git repository
gem "gitlab-grit", '~> 1.0.0', require: 'grit' gem "gitlab-grit", '~> 1.0.0', require: 'grit'
gem 'grit_ext', '~> 0.6.2'
# Ruby/Rack Git Smart-HTTP Server Handler # Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 1.0.0', require: 'grack' gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '2d1b2f13cabc02520405985fccb2a0abfcba9907'
# LDAP Auth # LDAP Auth
gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap" gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"

12
Gemfile.lock
View file

@ -6,14 +6,6 @@ GIT
activerecord (>= 2.3.0) activerecord (>= 2.3.0)
rake (>= 0.8.7) rake (>= 0.8.7)
GIT
remote: https://github.com/gitlabhq/grit_ext.git
revision: 2d1b2f13cabc02520405985fccb2a0abfcba9907
ref: 2d1b2f13cabc02520405985fccb2a0abfcba9907
specs:
grit_ext (0.6.2)
charlock_holmes (~> 0.6.9)
GIT GIT
remote: https://github.com/gitlabhq/raphael-rails.git remote: https://github.com/gitlabhq/raphael-rails.git
revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58 revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
@ -178,6 +170,8 @@ GEM
grape-entity (0.2.0) grape-entity (0.2.0)
activesupport activesupport
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
grit_ext (0.6.2)
charlock_holmes (~> 0.6.9)
growl (1.0.3) growl (1.0.3)
guard (1.5.4) guard (1.5.4)
listen (>= 0.4.2) listen (>= 0.4.2)
@ -480,7 +474,7 @@ DEPENDENCIES
gon gon
grape (~> 0.3.1) grape (~> 0.3.1)
grape-entity (~> 0.2.0) grape-entity (~> 0.2.0)
grit_ext! grit_ext (~> 0.6.2)
growl growl
guard-rspec guard-rspec
guard-spinach guard-spinach