diff options
author | Robert Speicher <robert@gitlab.com> | 2017-06-02 19:39:02 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-06-02 19:39:02 +0000 |
commit | 993412f9dea0ffb75d9f66ce47e13679cf479f5e (patch) | |
tree | e8062b136a3bd59a828b8a0f8c95b269ebc15e66 /app/models/commit.rb | |
parent | 3cdac884c77534b2a8572cdc2660d1fd93d05bce (diff) | |
parent | 4d1e987ec3263feda7a2f3469e31f5839e25731b (diff) | |
download | gitlab-ce-993412f9dea0ffb75d9f66ce47e13679cf479f5e.tar.gz |
Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'
Use the new Gitaly CommitDiff RPC
See merge request !11826
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r-- | app/models/commit.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 1a766c9f6d0..bfa3a624e70 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 |