diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-12 19:50:33 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-12 19:50:33 +0000 |
| commit | 33b4fc315ed504511a7f23835939ff8915e0fe01 (patch) | |
| tree | 1d2a3abd23857b283df92640ec9aca5e8f0dd5cf /app/helpers/todos_helper.rb | |
| parent | 7937014e1c4328d979d5d13eeb02a69ae82bf703 (diff) | |
| parent | d957d5f1aa45d3a8474678e5439ccdc09a545482 (diff) | |
| download | gitlab-ce-33b4fc315ed504511a7f23835939ff8915e0fe01.tar.gz | |
Merge branch 'approval-required-todo' into 'master'
Add approval required todos
Ports the 'approval required' todo type from EE - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/547
See merge request !5217
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 0925760e69c..e3a208f826a 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -13,6 +13,7 @@ module TodosHelper when Todo::MENTIONED then 'mentioned you on' when Todo::BUILD_FAILED then 'The build failed for your' when Todo::MARKED then 'added a todo for' + when Todo::APPROVAL_REQUIRED then 'set you as an approver for' end end |