summaryrefslogtreecommitdiff
path: root/app/models/commit.rb
diff options
context:
space:
mode:
authorAhmad Sherif <me@ahmadsherif.com>2017-06-07 14:21:39 +0200
committerAhmad Sherif <me@ahmadsherif.com>2017-06-07 14:21:39 +0200
commitb6eeb2cd22db6770f8acc1b65e6ad03c2bf9c708 (patch)
tree0bf43718bc2a679fae17b3e100b89626e25ceb12 /app/models/commit.rb
parentd27db3eaede283f1061d4ad433e6d92680343e72 (diff)
downloadgitlab-ce-reenable-gitaly-commit-raw-diffs.tar.gz
Re-enable Gitaly commit_raw_diffs migrationreenable-gitaly-commit-raw-diffs
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r--app/models/commit.rb11
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