Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master'

Add support for commit diff ignore_whitespace_change and paths flags

Closes gitaly#198

See merge request !11028

1 files changed, 8 insertions, 7 deletions

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 88a015cdb77..9359b323ed4 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -326,13 +326,14 @@ class Commit
   end
 
   def raw_diffs(*args)
-    # NOTE: This feature is intentionally disabled until
-    # https://gitlab.com/gitlab-org/gitaly/issues/178 is resolved
-    # if Gitlab::GitalyClient.feature_enabled?(:commit_raw_diffs)
-    #   Gitlab::GitalyClient::Commit.diff_from_parent(self, *args)
-    # else
-    raw.diffs(*args)
-    # end
+    use_gitaly = Gitlab::GitalyClient.feature_enabled?(:commit_raw_diffs)
+    deltas_only = args.last.is_a?(Hash) && args.last[:deltas_only]
+
+    if use_gitaly && !deltas_only
+      Gitlab::GitalyClient::Commit.diff_from_parent(self, *args)
+    else
+      raw.diffs(*args)
+    end
   end
 
   def diffs(diff_options = nil)