diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-12 10:41:57 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-12 10:41:57 +0000 |
| commit | 6ecfe0f987fe99426d3ef28d71a542db56e8fbf7 (patch) | |
| tree | 48c321f50c8ab69e64fa0fb6521b3dd07b055983 /app/models | |
| parent | cc9a413dcc57466f18ba756087c1ccd20aae40b0 (diff) | |
| parent | 27fb64d6a33ea61ba5a0a3ad50babff8c30fa45f (diff) | |
| download | gitlab-ce-6ecfe0f987fe99426d3ef28d71a542db56e8fbf7.tar.gz | |
Merge branch 'remove-deltas-only' into 'master'
Remove deltas_only from DiffCollection
Closes gitaly#224
See merge request !11285
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/commit.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 3a143a5a1f6..8d54ce6eb25 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -326,10 +326,7 @@ 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 + if Gitlab::GitalyClient.feature_enabled?(:commit_raw_diffs) Gitlab::GitalyClient::Commit.diff_from_parent(self, *args) else raw.diffs(*args) |