diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-19 14:05:38 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-19 14:05:38 +0300 |
| commit | d3f26be6f08cd0656589306eb06991b93d1c5825 (patch) | |
| tree | d00b4dbcaacfe281f6493b03b5e8f17d28c7de24 /app/helpers/todos_helper.rb | |
| parent | 2a0d6342912472b7ab9fa0036bd764841b388e7d (diff) | |
| parent | 85e0b99471b58078e1e50494ae26eb13430d3a9f (diff) | |
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 'app/helpers/todos_helper.rb')
| -rw-r--r-- | app/helpers/todos_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 74de25acf9d..c568cca9e5e 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -11,9 +11,10 @@ module TodosHelper case todo.action when Todo::ASSIGNED then 'assigned you' when Todo::MENTIONED then 'mentioned you on' - when Todo::BUILD_FAILED then 'The build failed for your' + when Todo::BUILD_FAILED then 'The build failed for' when Todo::MARKED then 'added a todo for' when Todo::APPROVAL_REQUIRED then 'set you as an approver for' + when Todo::UNMERGEABLE then 'Could not merge' end end |