diff --git a/Gemfile b/Gemfile index 68028c27577..aa35cb630b1 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ gem 'omniauth-github' # Extracting information from a git repository # We cannot use original git since some bugs 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 gem 'gitlab-grack', '~> 1.0.0', require: 'grack' diff --git a/Gemfile.lock b/Gemfile.lock index 65fc4ebdd15..08b2110f0a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM gitlab-pygments.rb (0.3.2) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) - gitlab_git (1.0.0) + gitlab_git (1.0.3) activesupport (~> 3.2.13) github-linguist (~> 2.3.4) grit (~> 2.5.0) @@ -506,7 +506,7 @@ DEPENDENCIES github-markup (~> 0.7.4) gitlab-grack (~> 1.0.0) gitlab-pygments.rb (~> 0.3.2) - gitlab_git (~> 1.0.0) + gitlab_git (~> 1.0.3) gitlab_meta (= 5.0) gitlab_omniauth-ldap (= 1.0.2) gollum-lib (~> 1.0.0) diff --git a/config/initializers/3_grit_ext.rb b/config/initializers/3_grit_ext.rb index 097c301a06a..2728f51c3ea 100644 --- a/config/initializers/3_grit_ext.rb +++ b/config/initializers/3_grit_ext.rb @@ -3,7 +3,3 @@ require 'pygments' Grit::Git.git_timeout = Gitlab.config.git.timeout Grit::Git.git_max_size = Gitlab.config.git.max_size - -Grit::Blob.class_eval do - include Linguist::BlobHelper -end