diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-02 21:45:29 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-02 21:45:29 +0300 |
| commit | 6b93fafb565ad340336506be1074fc7867c3da26 (patch) | |
| tree | ae1a50e9626e84ca5b0568098af48347036131ff | |
| parent | 8dcdb31430c33486eb108c4c0c9dee1b892b7bbd (diff) | |
| parent | 27d2f407fb5cffb70e3f6586df78b7f2680dcce3 (diff) | |
Merge branch 'zj-repo-checksum-opt-out' into 'master'
Compute repository checksum by default
Closes gitaly#1146
See merge request gitlab-org/gitlab-ce!18648
| -rw-r--r-- | changelogs/unreleased/zj-repo-checksum-opt-out.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/git/repository.rb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/zj-repo-checksum-opt-out.yml b/changelogs/unreleased/zj-repo-checksum-opt-out.yml new file mode 100644 index 00000000000..98dfedf7475 --- /dev/null +++ b/changelogs/unreleased/zj-repo-checksum-opt-out.yml @@ -0,0 +1,5 @@ +--- +title: Compute Gitlab::Git::Repository#checksum on Gitaly by default +merge_request: +author: +type: performance diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index de0044fc149..84d37f77fbb 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1569,7 +1569,8 @@ module Gitlab end def checksum - gitaly_migrate(:calculate_checksum) do |is_enabled| + gitaly_migrate(:calculate_checksum, + status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| if is_enabled gitaly_repository_client.calculate_checksum else |