diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-07-26 18:44:49 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-07-28 18:13:29 +0900 |
| commit | 1ad4efe64e1f51e17f9e03e01cb85908de139f93 (patch) | |
| tree | d5ae2dc00596dff6176da990ae2049cc957241d3 /spec/models/ci | |
| parent | 56418e85ac6b667d19495665860092ce4d74f55d (diff) | |
| download | gitlab-ce-1ad4efe64e1f51e17f9e03e01cb85908de139f93.tar.gz | |
fix merge miss
Diffstat (limited to 'spec/models/ci')
| -rw-r--r-- | spec/models/ci/pipeline_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 406608256e0..b0efa689a07 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -735,6 +735,8 @@ describe Ci::Pipeline do context 'on failure and build retry' do before do + stub_not_protect_default_branch + build.drop project.add_developer(user) @@ -1000,6 +1002,8 @@ describe Ci::Pipeline do let(:latest_status) { pipeline.statuses.latest.pluck(:status) } before do + stub_not_protect_default_branch + project.add_developer(user) end |