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

Re-enable Gitaly commit_raw_diffs migration See merge request !11970

Merge branch 'reenable-gitaly-commit-raw-diffs' into 'master'
6d01535e · Robert Speicher · 35614e43 · 204db056 · 6d01535e
Commit 6d01535e authored Jun 07, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

commit.rb app/models/commit.rb +5 -6

No files found.
--- 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