Commit 6d01535e authored by Robert Speicher's avatar Robert Speicher

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

Re-enable Gitaly commit_raw_diffs migration

See merge request !11970
parents 35614e43 204db056
Pipeline #8841522 failed with stages
in 100 minutes and 18 seconds
......@@ -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
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
end
def raw_deltas
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment