diff options
author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-03-29 04:23:45 +0300 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-04-11 22:00:44 +0300 |
commit | d6cc8feb6ce0a8e39a1bc8830b932155713357da (patch) | |
tree | e06ffc7ac8168f1857d9ee92bc8e4bcdc123810e /app/models/commit.rb | |
parent | 5e1a802b15af4ba991f9ed85a691f1a925cc0edf (diff) |
Setup and run a Gitaly server for testing if GitalyClient is enabled
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r-- | app/models/commit.rb | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 5c452f78546..8b8b3f00202 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -326,14 +326,13 @@ class Commit end def raw_diffs(*args) - use_gitaly = Gitlab::GitalyClient.feature_enabled?(:commit_raw_diffs) - deltas_only = args.last.is_a?(Hash) && args.last[:deltas_only] - - if use_gitaly && !deltas_only - Gitlab::GitalyClient::Commit.diff_from_parent(self, *args) - else - raw.diffs(*args) - end + # NOTE: This feature is intentionally disabled until + # https://gitlab.com/gitlab-org/gitaly/issues/178 is resolved + # if Gitlab::GitalyClient.feature_enabled?(:commit_raw_diffs) + # Gitlab::GitalyClient::Commit.diff_from_parent(self, *args) + # else + raw.diffs(*args) + # end end def diffs(diff_options = nil) |