diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 21:08:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 21:08:10 +0300 |
| commit | 175b4fa261259ab0d033482d10bb4159fee8e538 (patch) | |
| tree | e1f1dba5e41177f11ffded5a505e0e7f692b8df5 /spec/services/git | |
| parent | 4eea104c69e59f6fa53c7bc15b986c69f29b60c8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/git')
| -rw-r--r-- | spec/services/git/branch_push_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/git/branch_push_service_spec.rb b/spec/services/git/branch_push_service_spec.rb index 19d7b84a3ce..e7f005cff0b 100644 --- a/spec/services/git/branch_push_service_spec.rb +++ b/spec/services/git/branch_push_service_spec.rb @@ -108,7 +108,7 @@ describe Git::BranchPushService, services: true do end it 'reports an error' do - allow(Sidekiq).to receive(:server?).and_return(true) + allow(Gitlab::Runtime).to receive(:sidekiq?).and_return(true) expect(Sidekiq.logger).to receive(:warn) expect { subject }.not_to change { Ci::Pipeline.count } |