diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-07-15 15:10:49 -0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 22:46:38 -0400 |
| commit | 128f2845770b7a6d553ee764cdbbe63da5ba9e84 (patch) | |
| tree | fd0bced6c63c0b55df3beb78361325a0996a3ead /spec/features/notes_on_merge_requests_spec.rb | |
| parent | 0ef055a4aef76d20668a40717fb33bfe41599cfb (diff) | |
| download | gitlab-ce-128f2845770b7a6d553ee764cdbbe63da5ba9e84.tar.gz | |
Rebased on 6.0
-Had to do some minor test clean up as well
Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
Diffstat (limited to 'spec/features/notes_on_merge_requests_spec.rb')
| -rw-r--r-- | spec/features/notes_on_merge_requests_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb index 4fd7af89d21..16bdaf0f83c 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe "On a merge request", js: true do let!(:project) { create(:project_with_code) } let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) } - let!(:note) { create(:note_on_merge_request_with_attachment, source_project: project, target_project: project) } + let!(:note) { create(:note_on_merge_request_with_attachment, project: project) } before do login_as :user |