diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-06-27 00:45:57 +0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-18 06:45:03 +0400 |
| commit | 09112dbb1df2669b0042d6d785a5469a9855ac20 (patch) | |
| tree | 588ab6efb0d54df955b9701ac46cdf0d3c3d1cc5 /spec/contexts | |
| parent | bbef8bb5896d8858bf91692bdd5aa9236472a885 (diff) | |
Rebase on master
Trying to retrigger travis
Change-Id: Ifd86fb4c6b2791ad176230254fbf69a9ade979fb
Diffstat (limited to 'spec/contexts')
| -rw-r--r-- | spec/contexts/filter_context_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/contexts/filter_context_spec.rb b/spec/contexts/filter_context_spec.rb index 1732353dd76..0ecdb7416e5 100644 --- a/spec/contexts/filter_context_spec.rb +++ b/spec/contexts/filter_context_spec.rb @@ -9,7 +9,7 @@ describe FilterContext do let(:merge_request1) { create(:merge_request, author_id: user.id, source_project: project1, target_project: project2) } let(:merge_request2) { create(:merge_request, author_id: user.id, source_project: project2, target_project: project1) } let(:merge_request3) { create(:merge_request, author_id: user.id, source_project: project2, target_project: project2) } - let(:merge_request4) { create(:merge_request, author_id: user2.id, source_project: project2, target_project: project2) } + let(:merge_request4) { create(:merge_request, author_id: user2.id, source_project: project2, target_project: project2, target_branch:"notes_refactoring") } let(:issue1) { create(:issue, assignee_id: user.id, project: project1) } let(:issue2) { create(:issue, assignee_id: user.id, project: project2) } let(:issue3) { create(:issue, assignee_id: user2.id, project: project2) } |