diff --git a/Gemfile b/Gemfile
index 2f221683c63..c1d13aa51a9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ gem 'omniauth-shibboleth'
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
 # gem "gitlab_git", '~> 6.0', path: '../../gitlab_git'
-gem "gitlab_git", '~> 6.0', git: 'https://gitlab.com/gitlab-org/gitlab_git.git', ref: 'fab781735c1ab2a8f1dc2fda33b169af99ec7e2e'
+gem "gitlab_git", '~> 6.0', git: 'https://gitlab.com/gitlab-org/gitlab_git.git', ref: '97c160e0cbc54d9b5803030e5cc49157440bbe2a'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
diff --git a/Gemfile.lock b/Gemfile.lock
index b9da7e60a2b..1e5228acaa3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,13 @@
 GIT
   remote: https://gitlab.com/gitlab-org/gitlab_git.git
-  revision: fab781735c1ab2a8f1dc2fda33b169af99ec7e2e
-  ref: fab781735c1ab2a8f1dc2fda33b169af99ec7e2e
+  revision: 97c160e0cbc54d9b5803030e5cc49157440bbe2a
+  ref: 97c160e0cbc54d9b5803030e5cc49157440bbe2a
   specs:
     gitlab_git (6.3.0)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.6)
-      gitlab-grit (~> 2.6)
       gitlab-linguist (~> 3.0)
+      rubyzip (~> 1.1)
       rugged (~> 0.21.0)
 
 GEM
@@ -446,6 +446,7 @@ GEM
     ruby-progressbar (1.2.0)
     rubyntlm (0.1.1)
     rubypants (0.2.0)
+    rubyzip (1.1.6)
     rugged (0.21.0)
     safe_yaml (0.9.7)
     sanitize (2.1.0)
diff --git a/app/models/commit.rb b/app/models/commit.rb
index ff5392957ce..c8b2e0475ff 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -108,4 +108,8 @@ class Commit
 
     super
   end
+
+  def parents
+    @parents ||= Commit.decorate(super)
+  end
 end