diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2017-06-07 15:21:39 +0300 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-06-07 17:55:45 +0300 |
| commit | 204db05637076b832adff113dc15615587b81523 (patch) | |
| tree | c5eb8869e89a451575e78217f9f958c76bd1bc6f /app/models | |
| parent | 6ee216c4d96f0e5c9b2f4bfe21fa808b476f8365 (diff) | |
Re-enable Gitaly commit_raw_diffs migration
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/commit.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index bfa3a624e70..1a766c9f6d0 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -326,12 +326,11 @@ class Commit end def raw_diffs(*args) - # 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 + 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 |