diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-11 22:27:16 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-11 22:27:16 +0000 |
| commit | 16e895801e5ba2f27de6d33511c8ac46297048eb (patch) | |
| tree | be3f759b4297bb175d2b154e24a363cda14bc884 /lib/gitlab/git/repository.rb | |
| parent | 587242656f57df997b7356f31369cc30d7a79f6c (diff) | |
| parent | 92d62ff69d5e92730937e909c7e216234d485ba1 (diff) | |
| download | gitlab-ce-16e895801e5ba2f27de6d33511c8ac46297048eb.tar.gz | |
Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'
Migrate rebase_in_progress? to Gitaly
Closes gitaly#866
See merge request gitlab-org/gitlab-ce!16286
Diffstat (limited to 'lib/gitlab/git/repository.rb')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index b294b7a5582..d0467bca992 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1254,7 +1254,13 @@ module Gitlab end def rebase_in_progress?(rebase_id) - fresh_worktree?(worktree_path(REBASE_WORKTREE_PREFIX, rebase_id)) + gitaly_migrate(:rebase_in_progress) do |is_enabled| + if is_enabled + gitaly_repository_client.rebase_in_progress?(rebase_id) + else + fresh_worktree?(worktree_path(REBASE_WORKTREE_PREFIX, rebase_id)) + end + end end def squash(user, squash_id, branch:, start_sha:, end_sha:, author:, message:) |