Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-18 22:02:00 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-18 22:02:00 +0400
commit9ada67881970b05d4be49cbe329b4bf50ffe4f77 (patch)
tree1c68833adba7876f20412b4e9ec6fef138eeb5fa /spec/models/merge_request_spec.rb
parentaa8d4d9fea175e209ac3652f3743ce2801144a66 (diff)
Split commit_id and noteable_id for Note
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r--spec/models/merge_request_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index d70647f668d..a0849401254 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -42,7 +42,7 @@ describe MergeRequest do
before do
merge_request.stub(:commits) { [merge_request.project.commit] }
- create(:note, noteable: merge_request.commits.first)
+ create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit')
create(:note, noteable: merge_request)
end