Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'

Use the new Gitaly CommitDiff RPC

See merge request !11826

1 files changed, 6 insertions, 5 deletions

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 1a766c9f6d0..bfa3a624e70 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -326,11 +326,12 @@ class Commit
   end
 
   def raw_diffs(*args)
-    if Gitlab::GitalyClient.feature_enabled?(:commit_raw_diffs)
-      Gitlab::GitalyClient::Commit.new(project.repository).diff_from_parent(self, *args)
-    else
-      raw.diffs(*args)
-    end
+    # Uncomment when https://gitlab.com/gitlab-org/gitaly/merge_requests/170 is merged
+    # if Gitlab::GitalyClient.feature_enabled?(:commit_raw_diffs)
+    #   Gitlab::GitalyClient::Commit.new(project.repository).diff_from_parent(self, *args)
+    # else
+    raw.diffs(*args)
+    # end
   end
 
   def raw_deltas