Update gitlab_git to 1.0.3
This commit is contained in:
parent
233c9b8587
commit
ca281483b3
3 changed files with 3 additions and 7 deletions
2
Gemfile
2
Gemfile
|
@ -24,7 +24,7 @@ gem 'omniauth-github'
|
||||||
# Extracting information from a git repository
|
# Extracting information from a git repository
|
||||||
# We cannot use original git since some bugs
|
# We cannot use original git since some bugs
|
||||||
gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: '42297cdcee16284d2e4eff23d41377f52fc28b9d'
|
gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: '42297cdcee16284d2e4eff23d41377f52fc28b9d'
|
||||||
gem 'gitlab_git', '~> 1.0.0'
|
gem 'gitlab_git', '~> 1.0.3'
|
||||||
|
|
||||||
# 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'
|
||||||
|
|
|
@ -164,7 +164,7 @@ GEM
|
||||||
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)
|
||||||
gitlab_git (1.0.0)
|
gitlab_git (1.0.3)
|
||||||
activesupport (~> 3.2.13)
|
activesupport (~> 3.2.13)
|
||||||
github-linguist (~> 2.3.4)
|
github-linguist (~> 2.3.4)
|
||||||
grit (~> 2.5.0)
|
grit (~> 2.5.0)
|
||||||
|
@ -506,7 +506,7 @@ DEPENDENCIES
|
||||||
github-markup (~> 0.7.4)
|
github-markup (~> 0.7.4)
|
||||||
gitlab-grack (~> 1.0.0)
|
gitlab-grack (~> 1.0.0)
|
||||||
gitlab-pygments.rb (~> 0.3.2)
|
gitlab-pygments.rb (~> 0.3.2)
|
||||||
gitlab_git (~> 1.0.0)
|
gitlab_git (~> 1.0.3)
|
||||||
gitlab_meta (= 5.0)
|
gitlab_meta (= 5.0)
|
||||||
gitlab_omniauth-ldap (= 1.0.2)
|
gitlab_omniauth-ldap (= 1.0.2)
|
||||||
gollum-lib (~> 1.0.0)
|
gollum-lib (~> 1.0.0)
|
||||||
|
|
|
@ -3,7 +3,3 @@ require 'pygments'
|
||||||
|
|
||||||
Grit::Git.git_timeout = Gitlab.config.git.timeout
|
Grit::Git.git_timeout = Gitlab.config.git.timeout
|
||||||
Grit::Git.git_max_size = Gitlab.config.git.max_size
|
Grit::Git.git_max_size = Gitlab.config.git.max_size
|
||||||
|
|
||||||
Grit::Blob.class_eval do
|
|
||||||
include Linguist::BlobHelper
|
|
||||||
end
|
|
||||||
|
|
Loading…
Reference in a new issue