diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-05 08:48:06 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-05 08:48:06 +0000 |
| commit | 4ef3e835cfee2ea63c29398d86d642571821fe32 (patch) | |
| tree | 38a0da5660d62b832c20daf76db0c71f1b52497a | |
| parent | 7412ad2e3680b7f7a18d89dd8e30f01b28c19326 (diff) | |
| parent | 2ba0118505ef52ff46ba3b0d6c457c87ffa7f97a (diff) | |
| download | gitlab-ce-4ef3e835cfee2ea63c29398d86d642571821fe32.tar.gz | |
Merge branch 'zj-opt-out-list-commits-by-oid' into 'master'
Move ListCommitsByOid to OPT_OUT
See merge request gitlab-org/gitlab-ce!18175
| -rw-r--r-- | changelogs/unreleased/zj-opt-out-list-commits-by-oid.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/git/commit.rb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/zj-opt-out-list-commits-by-oid.yml b/changelogs/unreleased/zj-opt-out-list-commits-by-oid.yml new file mode 100644 index 00000000000..3871293ee04 --- /dev/null +++ b/changelogs/unreleased/zj-opt-out-list-commits-by-oid.yml @@ -0,0 +1,5 @@ +--- +title: ListCommitsByOid is executed by Gitaly by default +merge_request: +author: +type: performance diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb index 93037ed8d90..0fb82441bf8 100644 --- a/lib/gitlab/git/commit.rb +++ b/lib/gitlab/git/commit.rb @@ -231,7 +231,8 @@ module Gitlab # relation to each other. The last 10 commits for a branch for example, # should go through .where def batch_by_oid(repo, oids) - repo.gitaly_migrate(:list_commits_by_oid) do |is_enabled| + repo.gitaly_migrate(:list_commits_by_oid, + status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| if is_enabled repo.gitaly_commit_client.list_commits_by_oid(oids) else |