diff options
| author | Jose <jivanvl@hotmail.com> | 2018-04-30 17:00:16 -0500 |
|---|---|---|
| committer | Jose <jivanvl@hotmail.com> | 2018-04-30 17:00:16 -0500 |
| commit | d3327e0dfacd27d547ffdb3b7f4a1a76c76ae281 (patch) | |
| tree | 82019118f22877ec9135d45620c9dcf8acd0579e /spec/services/ci/retry_pipeline_service_spec.rb | |
| parent | f48f40bf267fd0f35ba09fd3b8f30e17c0789327 (diff) | |
| parent | 2f7b71df7619768220657ed47c7737f4c3e19e90 (diff) | |
| download | gitlab-ce-d3327e0dfacd27d547ffdb3b7f4a1a76c76ae281.tar.gz | |
Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui
Diffstat (limited to 'spec/services/ci/retry_pipeline_service_spec.rb')
| -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 |