Use gitlab_git gem
This commit is contained in:
parent
13dd7eb476
commit
233c9b8587
6
Gemfile
6
Gemfile
|
@ -22,11 +22,9 @@ gem 'omniauth-twitter'
|
|||
gem 'omniauth-github'
|
||||
|
||||
# Extracting information from a git repository
|
||||
# Since gollum requires grit we cannot use gitlab-grit gem name any more. Use grit instead
|
||||
# We cannot use original git since some bugs
|
||||
gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: '42297cdcee16284d2e4eff23d41377f52fc28b9d'
|
||||
gem 'grit_ext', '~> 0.8.1'
|
||||
|
||||
gem 'gitlab_git', git: 'https://github.com/gitlabhq/gitlab_git.git', ref: '40703ee3925102a77f70c038b1948c251a9aaa46'
|
||||
gem 'gitlab_git', '~> 1.0.0'
|
||||
|
||||
# Ruby/Rack Git Smart-HTTP Server Handler
|
||||
gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
|
||||
|
|
18
Gemfile.lock
18
Gemfile.lock
|
@ -6,16 +6,6 @@ GIT
|
|||
activerecord (>= 2.3.0)
|
||||
rake (>= 0.8.7)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/gitlabhq/gitlab_git.git
|
||||
revision: 40703ee3925102a77f70c038b1948c251a9aaa46
|
||||
ref: 40703ee3925102a77f70c038b1948c251a9aaa46
|
||||
specs:
|
||||
gitlab_git (1.0.0)
|
||||
activesupport (~> 3.2.13)
|
||||
github-linguist (~> 2.3.4)
|
||||
grit (~> 2.5.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/gitlabhq/grit.git
|
||||
revision: 42297cdcee16284d2e4eff23d41377f52fc28b9d
|
||||
|
@ -174,6 +164,11 @@ GEM
|
|||
gitlab-pygments.rb (0.3.2)
|
||||
posix-spawn (~> 0.3.6)
|
||||
yajl-ruby (~> 1.1.0)
|
||||
gitlab_git (1.0.0)
|
||||
activesupport (~> 3.2.13)
|
||||
github-linguist (~> 2.3.4)
|
||||
grit (~> 2.5.0)
|
||||
grit_ext (~> 0.8.1)
|
||||
gitlab_meta (5.0)
|
||||
gitlab_omniauth-ldap (1.0.2)
|
||||
net-ldap (~> 0.2.2)
|
||||
|
@ -511,7 +506,7 @@ DEPENDENCIES
|
|||
github-markup (~> 0.7.4)
|
||||
gitlab-grack (~> 1.0.0)
|
||||
gitlab-pygments.rb (~> 0.3.2)
|
||||
gitlab_git!
|
||||
gitlab_git (~> 1.0.0)
|
||||
gitlab_meta (= 5.0)
|
||||
gitlab_omniauth-ldap (= 1.0.2)
|
||||
gollum-lib (~> 1.0.0)
|
||||
|
@ -519,7 +514,6 @@ DEPENDENCIES
|
|||
grape (~> 0.3.1)
|
||||
grape-entity (~> 0.2.0)
|
||||
grit (~> 2.5.0)!
|
||||
grit_ext (~> 0.8.1)
|
||||
growl
|
||||
guard-rspec
|
||||
guard-spinach
|
||||
|
|
Loading…
Reference in New Issue