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 /app/views/dashboard | |
| 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 'app/views/dashboard')
| -rw-r--r-- | app/views/dashboard/todos/_todo.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml index 9849b31d7e2..9d7bcdb9d16 100644 --- a/app/views/dashboard/todos/_todo.html.haml +++ b/app/views/dashboard/todos/_todo.html.haml @@ -3,7 +3,7 @@ .todo-item.todo-block .todo-title.title - - unless todo.build_failed? + - unless todo.build_failed? || todo.unmergeable? = todo_target_state_pill(todo) %span.author-name |