From 417a21a123a3f5e22d5fa1a8442f0aa10a206e55 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Fri, 22 Jun 2018 11:49:46 +0200 Subject: Raw diffs are served from Gitaly Closes https://gitlab.com/gitlab-org/gitaly/issues/222 --- lib/gitlab/git/commit.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb index c9806cdb85f..341768752dc 100644 --- a/lib/gitlab/git/commit.rb +++ b/lib/gitlab/git/commit.rb @@ -381,15 +381,11 @@ module Gitlab # empty repo. See Repository#diff for keys allowed in the +options+ # hash. def diff_from_parent(options = {}) - Gitlab::GitalyClient.migrate(:commit_raw_diffs) do |is_enabled| - if is_enabled - @repository.gitaly_commit_client.diff_from_parent(self, options) - else - rugged_diff_from_parent(options) - end - end + @repository.gitaly_commit_client.diff_from_parent(self, options) end + # Not to be called directly, but right now its used for tests and in old + # migrations def rugged_diff_from_parent(options = {}) options ||= {} break_rewrites = options[:break_rewrites] -- cgit v1.2.1