diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 18:58:24 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 18:58:24 +0300 |
commit | 3f2db9d971dd92b446e2a615ed758090079a8c64 (patch) | |
tree | c3034fc5bde8c3d0d2516de01e67d44c0c796fa1 /spec/factories/notes.rb | |
parent | 5b43eeee97f8e06a4ada4b173cb972c20d58d8ed (diff) | |
parent | ac4e3e8cf016f2c2b3dcf3997673310a5df658a9 (diff) | |
download | gitlab-ce-button-focus-state.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into button-focus-statebutton-focus-state
Diffstat (limited to 'spec/factories/notes.rb')
-rw-r--r-- | spec/factories/notes.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index c32e205ee69..696cf276e57 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -16,8 +16,6 @@ FactoryGirl.define do 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] - factory :downvote_note, traits: [:award, :downvote] - factory :upvote_note, traits: [:award, :upvote] trait :on_commit do noteable nil @@ -46,10 +44,6 @@ FactoryGirl.define do system true end - trait :award do - is_award true - end - trait :downvote do note "thumbsdown" end |