summaryrefslogtreecommitdiff
path: root/app/models/commit.rb
diff options
context:
space:
mode:
authorAhmad Sherif <me@ahmadsherif.com>2017-05-30 21:30:05 +0200
committerAhmad Sherif <me@ahmadsherif.com>2017-06-02 18:33:18 +0200
commit4d1e987ec3263feda7a2f3469e31f5839e25731b (patch)
tree893c6a8e26011e1cafe34c77c70d2b3de32bffb6 /app/models/commit.rb
parent358662a9f7474b41755ec0128efaaa8bef3cb249 (diff)
downloadgitlab-ce-4d1e987ec3263feda7a2f3469e31f5839e25731b.tar.gz
Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpc
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r--app/models/commit.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb
index dbc0a22829e..c1c1f282db1 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -326,11 +326,12 @@ class Commit
end
def raw_diffs(*args)
- if Gitlab::GitalyClient.feature_enabled?(:commit_raw_diffs)
- Gitlab::GitalyClient::Commit.new(project.repository).diff_from_parent(self, *args)
- else
- raw.diffs(*args)
- end
+ # Uncomment when https://gitlab.com/gitlab-org/gitaly/merge_requests/170 is merged
+ # if Gitlab::GitalyClient.feature_enabled?(:commit_raw_diffs)
+ # Gitlab::GitalyClient::Commit.new(project.repository).diff_from_parent(self, *args)
+ # else
+ raw.diffs(*args)
+ # end
end
def raw_deltas