diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2017-06-07 14:21:39 +0200 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-06-07 14:21:39 +0200 |
| commit | b6eeb2cd22db6770f8acc1b65e6ad03c2bf9c708 (patch) | |
| tree | 0bf43718bc2a679fae17b3e100b89626e25ceb12 | |
| parent | d27db3eaede283f1061d4ad433e6d92680343e72 (diff) | |
| download | gitlab-ce-reenable-gitaly-commit-raw-diffs.tar.gz | |
Re-enable Gitaly commit_raw_diffs migrationreenable-gitaly-commit-raw-diffs
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | app/models/commit.rb | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 78bc1abd14f..d9df1bbc0c7 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -0.10.0 +0.11.0 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 |