diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-25 13:40:13 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-25 13:40:13 +0000 |
| commit | 37b9a441c1b74c679419ecd6c9560ab4390898b9 (patch) | |
| tree | 2fce001235b0ea3adb06bf1d37a6c21d5d336b6e /spec/services/ci | |
| parent | df6a2d423ea4dac3484669f6f49c535b36288d5d (diff) | |
| parent | 5beb4ddebfa23b288dc088c7175c2456d411f4f1 (diff) | |
| download | gitlab-ce-37b9a441c1b74c679419ecd6c9560ab4390898b9.tar.gz | |
Merge branch 'master' into 'backstage/gb/migrate-pipeline-stages-index'
# Conflicts:
# db/schema.rb
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 |