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 /app/helpers/todos_helper.rb | |
| parent | f14228f0f2f69a967c483e4aa4ef1568e5fdc49b (diff) | |
| download | gitlab-ce-85e0b99471b58078e1e50494ae26eb13430d3a9f.tar.gz | |
Notify the user who set auto-merge when merge conflict occurs
Diffstat (limited to 'app/helpers/todos_helper.rb')
| -rw-r--r-- | app/helpers/todos_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 3c039b43f5d..56c05cb54e6 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -14,6 +14,7 @@ module TodosHelper 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 |