Merge branch 'reenable-gitaly-commit-raw-diffs' into 'master'

Re-enable Gitaly commit_raw_diffs migration

See merge request !11970

1 files changed, 5 insertions, 6 deletions

diff --git a/app/models/commit.rb b/app/models/commit.rb
index bfa3a624e70..1a766c9f6d0 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -326,12 +326,11 @@ class Commit
   end
 
   def raw_diffs(*args)
-    # 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
+    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