Commit 70bc8665 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'zj-commit-raw-diffs' into 'master'

Raw diffs are served from Gitaly

Closes gitaly#222

See merge request gitlab-org/gitlab-ce!20091
parents 1db24239 417a21a1
...@@ -381,15 +381,11 @@ module Gitlab ...@@ -381,15 +381,11 @@ module Gitlab
# empty repo. See Repository#diff for keys allowed in the +options+ # empty repo. See Repository#diff for keys allowed in the +options+
# hash. # hash.
def diff_from_parent(options = {}) def diff_from_parent(options = {})
Gitlab::GitalyClient.migrate(:commit_raw_diffs) do |is_enabled| @repository.gitaly_commit_client.diff_from_parent(self, options)
if is_enabled
@repository.gitaly_commit_client.diff_from_parent(self, options)
else
rugged_diff_from_parent(options)
end
end
end end
# Not to be called directly, but right now its used for tests and in old
# migrations
def rugged_diff_from_parent(options = {}) def rugged_diff_from_parent(options = {})
options ||= {} options ||= {}
break_rewrites = options[:break_rewrites] break_rewrites = options[:break_rewrites]
......
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