diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-19 11:05:38 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-19 11:05:38 +0000 |
| commit | d3f26be6f08cd0656589306eb06991b93d1c5825 (patch) | |
| tree | d00b4dbcaacfe281f6493b03b5e8f17d28c7de24 /spec/factories | |
| parent | 2a0d6342912472b7ab9fa0036bd764841b388e7d (diff) | |
| parent | 85e0b99471b58078e1e50494ae26eb13430d3a9f (diff) | |
| download | gitlab-ce-d3f26be6f08cd0656589306eb06991b93d1c5825.tar.gz | |
Merge branch '23524-notify-automerge-user-of-failed-build' into 'master'
Notify the user who set auto-merge when merge is not possible
Closes #23524
See merge request !8056
Diffstat (limited to 'spec/factories')
| -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 082b02116c0..85a8c263643 100644 --- a/spec/factories/todos.rb +++ b/spec/factories/todos.rb @@ -28,6 +28,10 @@ FactoryGirl.define do action { Todo::APPROVAL_REQUIRED } end + trait :unmergeable do + action { Todo::UNMERGEABLE } + end + trait :done do state :done end |