diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-05-18 21:05:53 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-18 21:05:53 +0300 |
| commit | bb883387f9e4d5564b455cce7d412f730664a2f5 (patch) | |
| tree | 02f972c30f9a01d605e2c88a22b2c7172694e475 /spec/factories/notes.rb | |
| parent | 7a4e7ad04e1fc96953d9159e8e1a2208990d34f7 (diff) | |
| parent | b7d83acf5b03e08dc9e387e1abb83c5e3c80444c (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# app/models/note.rb
# db/schema.rb
# spec/models/note_spec.rb
Diffstat (limited to 'spec/factories/notes.rb')
| -rw-r--r-- | spec/factories/notes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index e65204cbe7b..2603b4fb0ce 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -9,10 +9,10 @@ FactoryGirl.define do author factory :note_on_commit, traits: [:on_commit] - factory :note_on_commit_diff, traits: [:on_commit, :on_diff] + factory :note_on_commit_diff, traits: [:on_commit, :on_diff], class: LegacyDiffNote factory :note_on_issue, traits: [:on_issue], aliases: [:votable_note] factory :note_on_merge_request, traits: [:on_merge_request] - factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff] + factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff], class: LegacyDiffNote factory :note_on_project_snippet, traits: [:on_project_snippet] factory :system_note, traits: [:system] |