diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-01-04 23:38:13 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-04 23:38:13 +0100 |
| commit | 9c9f7dc639768a0d6b930ec11c050a1333df934e (patch) | |
| tree | 7a54287bb3e8eec9a57223bdace347de72beb936 /spec/models/ci | |
| parent | 6fb4a533b74c861a1e533604da462efb6d309de0 (diff) | |
| parent | 6f1b4dc76b4619f538b7216ad3a10ca9336d0c2b (diff) | |
| download | gitlab-ce-9c9f7dc639768a0d6b930ec11c050a1333df934e.tar.gz | |
Merge branch 'master' into 41249-clearing-the-cache
Diffstat (limited to 'spec/models/ci')
| -rw-r--r-- | spec/models/ci/pipeline_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/ci/trigger_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index a1f63a2534b..7bef798a782 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -1440,7 +1440,7 @@ describe Ci::Pipeline, :mailer do end before do - project.team << [pipeline.user, Gitlab::Access::DEVELOPER] + project.add_developer(pipeline.user) pipeline.user.global_notification_setting .update(level: 'custom', failed_pipeline: true, success_pipeline: true) diff --git a/spec/models/ci/trigger_spec.rb b/spec/models/ci/trigger_spec.rb index bd9c837402f..d4b72205203 100644 --- a/spec/models/ci/trigger_spec.rb +++ b/spec/models/ci/trigger_spec.rb @@ -69,7 +69,7 @@ describe Ci::Trigger do context 'and is member of the project' do before do - project.team << [owner, :developer] + project.add_developer(owner) end it { is_expected.to eq(true) } |