diff options
| author | GitalyBot <gitalybot@zjvandeweg.nl> | 2019-06-25 14:45:51 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2019-06-25 14:45:51 +0000 |
| commit | e7b54b9cb8c494f97a48e170696e5d56065aea31 (patch) | |
| tree | e378d00ddfa89081379e2b7e9ab12d4b7c10a13e /lib | |
| parent | d6c7d4c48db51fdc3eb479e53d40ce4358695218 (diff) | |
| download | gitlab-ce-e7b54b9cb8c494f97a48e170696e5d56065aea31.tar.gz | |
Fix broken worktree test
The setup was wrong, and due to Gitaly being a bit more strict it had to
match up. The test is now accurate and passing again.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index a6739f12280..19b6aab1c4f 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -15,11 +15,6 @@ module Gitlab SEARCH_CONTEXT_LINES = 3 REV_LIST_COMMIT_LIMIT = 2_000 - # In https://gitlab.com/gitlab-org/gitaly/merge_requests/698 - # We copied these two prefixes into gitaly-go, so don't change these - # or things will break! (REBASE_WORKTREE_PREFIX and SQUASH_WORKTREE_PREFIX) - REBASE_WORKTREE_PREFIX = 'rebase'.freeze - SQUASH_WORKTREE_PREFIX = 'squash'.freeze GITALY_INTERNAL_URL = 'ssh://gitaly/internal.git'.freeze GITLAB_PROJECTS_TIMEOUT = Gitlab.config.gitlab_shell.git_timeout EMPTY_REPOSITORY_CHECKSUM = '0000000000000000000000000000000000000000'.freeze |