summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-06-22 11:49:46 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-06-22 13:40:38 +0200
commit417a21a123a3f5e22d5fa1a8442f0aa10a206e55 (patch)
treea9404601491dc87648ec7ced3fec39b30e44b28a /lib
parent348ad22d7a02277dc84c99072b7833ef9ff99c5b (diff)
downloadgitlab-ce-417a21a123a3f5e22d5fa1a8442f0aa10a206e55.tar.gz
Raw diffs are served from Gitalyzj-commit-raw-diffs
Closes https://gitlab.com/gitlab-org/gitaly/issues/222
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/commit.rb10
1 files 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]