diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-08-01 17:28:28 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-08-01 18:33:41 +0800 |
| commit | 87d754cfdfb5759140fb5d0333b6111bcc3477c9 (patch) | |
| tree | 85781700cdcd7e55f0d134ab4da8941f9aa9629b | |
| parent | 4bb9a36c97ac925c11c0211e3ef1f8ca1306da32 (diff) | |
| download | gitlab-ce-disable-gitaly-for-tags.tar.gz | |
Disable it for now, because it's blocking CE to EEdisable-gitaly-for-tags
See:
* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13092#note_36349158
* https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2554#note_36403262
| -rw-r--r-- | lib/gitlab/git/repository.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index a3bc79109f8..b3613c53e47 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -169,7 +169,12 @@ module Gitlab # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/390 def tags gitaly_migrate(:tags) do |is_enabled| - if is_enabled + # We disable this because: + # https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2554#note_36403262 + # We should flip it back in: + # https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13092 + # rubocop:disable Lint/LiteralInCondition + if false # is_enabled tags_from_gitaly else tags_from_rugged |