diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2018-07-06 13:01:15 +0300 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-07-06 13:01:15 +0300 |
commit | b012abee8bc6fc183d3b5f4f6bc009726d52e285 (patch) | |
tree | 71bf8d5178bd62c336e3481b36f9a4f13fb91f78 /lib/gitlab/workhorse.rb | |
parent | f5b12225d8ee8686eddeb35b2851d93631f72c89 (diff) |
Make all Gitaly diff flags mandatory
Diffstat (limited to 'lib/gitlab/workhorse.rb')
-rw-r--r-- | lib/gitlab/workhorse.rb | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index e893e46ee86..79483ee05f8 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -91,16 +91,12 @@ module Gitlab end def send_git_diff(repository, diff_refs) - params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) - { - 'GitalyServer' => gitaly_server_hash(repository), - 'RawDiffRequest' => Gitaly::RawDiffRequest.new( - gitaly_diff_or_patch_hash(repository, diff_refs) - ).to_json - } - else - workhorse_diff_or_patch_hash(repository, diff_refs) - end + params = { + 'GitalyServer' => gitaly_server_hash(repository), + 'RawDiffRequest' => Gitaly::RawDiffRequest.new( + gitaly_diff_or_patch_hash(repository, diff_refs) + ).to_json + } [ SEND_DATA_HEADER, |