diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-04-26 14:23:36 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-04-26 14:23:36 +0900 |
| commit | 4eb67ccff350d181e60e4666e459a364cd36b064 (patch) | |
| tree | c2c3e606b364dc5f1eee3320cba9f8312be7e634 /spec/services/ci | |
| parent | 0262ed904d293fba9ceb0e3d79f62ffe8e8a239f (diff) | |
| parent | 55f07cc32e7684b21e0c1662c70128df14c6abf7 (diff) | |
| download | gitlab-ce-4eb67ccff350d181e60e4666e459a364cd36b064.tar.gz | |
Merge branch 'master' into live-trace-v2
Diffstat (limited to 'spec/services/ci')
| -rw-r--r-- | spec/services/ci/retry_pipeline_service_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/services/ci/retry_pipeline_service_spec.rb b/spec/services/ci/retry_pipeline_service_spec.rb index 6ce75c65c8c..f1acfc48468 100644 --- a/spec/services/ci/retry_pipeline_service_spec.rb +++ b/spec/services/ci/retry_pipeline_service_spec.rb @@ -235,6 +235,8 @@ describe Ci::RetryPipelineService, '#execute' do context 'when user is not allowed to trigger manual action' do before do project.add_developer(user) + create(:protected_branch, :masters_can_push, + name: pipeline.ref, project: project) end context 'when there is a failed manual action present' do |