diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-23 09:34:59 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-01-23 09:34:59 +0000 |
| commit | 09fc32173f8b984f473b58350113634f4b4c0456 (patch) | |
| tree | 796e02d6193336fe6e36709426fe13e087a8fe65 /spec/lib/gitlab/git | |
| parent | 11463bf9ec06ccc5431f09ec19f627648f57c123 (diff) | |
| parent | 2e0951e93f15ab3437cb13a1a2be36f45f777c3c (diff) | |
| download | gitlab-ce-09fc32173f8b984f473b58350113634f4b4c0456.tar.gz | |
Merge branch 'gitaly-user-commit-files' into 'master'
Incorporate Gitaly's OperationService.UserCommitFiles RPC
Closes gitaly#890
See merge request gitlab-org/gitlab-ce!16307
Diffstat (limited to 'spec/lib/gitlab/git')
| -rw-r--r-- | spec/lib/gitlab/git/gitlab_projects_spec.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/lib/gitlab/git/gitlab_projects_spec.rb b/spec/lib/gitlab/git/gitlab_projects_spec.rb index 78e4fbca28e..f4b964e1ee9 100644 --- a/spec/lib/gitlab/git/gitlab_projects_spec.rb +++ b/spec/lib/gitlab/git/gitlab_projects_spec.rb @@ -219,6 +219,9 @@ describe Gitlab::Git::GitlabProjects do before do FileUtils.mkdir_p(dest_repos_path) + + # Undo spec_helper stub that deletes hooks + allow_any_instance_of(described_class).to receive(:fork_repository).and_call_original end after do |