diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-16 14:43:43 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-16 14:43:43 +0100 |
| commit | 35b5ea0af7c40671bf15ef5e2ac4dc4aafc75440 (patch) | |
| tree | 8cb77756d3ecf51e70837d7c1ccc371ba68e555f /spec/tasks/gitlab/backup_rake_spec.rb | |
| parent | f80d2ab3c603fd8dd90b2ca3ed1fa92202916b00 (diff) | |
| parent | 4fcff0bfa2f0d8b0a9f60e93bee807334557918f (diff) | |
| download | gitlab-ce-35b5ea0af7c40671bf15ef5e2ac4dc4aafc75440.tar.gz | |
Merge branch 'issue-edit-inline' into issue-edit-inline-description-field-specs
[ci skip]
Diffstat (limited to 'spec/tasks/gitlab/backup_rake_spec.rb')
| -rw-r--r-- | spec/tasks/gitlab/backup_rake_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb index 4def113dd77..0ff1a988a9e 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/spec/tasks/gitlab/backup_rake_spec.rb @@ -236,7 +236,6 @@ describe 'gitlab:app namespace rake task' do 'custom' => { 'path' => Settings.absolute('tmp/tests/custom_storage'), 'gitaly_address' => gitaly_address } } allow(Gitlab.config.repositories).to receive(:storages).and_return(storages) - Gitlab::GitalyClient.configure_channels # Create the projects now, after mocking the settings but before doing the backup project_a |