diff options
| author | twonegatives <whitewhiteheaven@gmail.com> | 2016-12-14 17:37:31 +0300 |
|---|---|---|
| committer | twonegatives <whitewhiteheaven@gmail.com> | 2017-01-14 12:22:30 +0300 |
| commit | 85e0b99471b58078e1e50494ae26eb13430d3a9f (patch) | |
| tree | df3d2fdb18a1b315cf77fdd9536bd99046d5313a /spec/factories/todos.rb | |
| parent | f14228f0f2f69a967c483e4aa4ef1568e5fdc49b (diff) | |
Notify the user who set auto-merge when merge conflict occurs
Diffstat (limited to 'spec/factories/todos.rb')
| -rw-r--r-- | spec/factories/todos.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/factories/todos.rb b/spec/factories/todos.rb index 866e663f026..dc247e2d96d 100644 --- a/spec/factories/todos.rb +++ b/spec/factories/todos.rb @@ -27,6 +27,10 @@ FactoryGirl.define do action { Todo::APPROVAL_REQUIRED } end + trait :unmergeable do + action { Todo::UNMERGEABLE } + end + trait :done do state :done end |