diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-14 20:47:13 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-14 20:47:13 +0000 |
| commit | f4710ee83cea4c8a6b3d37f19d798757bf30ab4c (patch) | |
| tree | af1b79d6ab7ffddb0bd08a9006e3c097e3d24bac /app | |
| parent | c04e3af4844f040767fa99202f96d202d0f5ee2a (diff) | |
| parent | 5ab8536f4663a831bbe2e3acb6fd485a7d68c39f (diff) | |
| download | gitlab-ce-f4710ee83cea4c8a6b3d37f19d798757bf30ab4c.tar.gz | |
Merge branch 'issue-13823' into 'master'
Issue #13823: random message when all Todos are Done
## What does this MR do?
Shows a random message every time the To Do list is empty: https://gitlab.com/gitlab-org/gitlab-ce/issues/13823
## Are there points in the code the reviewer needs to double check?
It's my first contribution to GitLab so I might need some help:
- I'm loading a yaml file in the controller. I'm not sure where would be the best place to put it.
- I'm also having the error below running the tests but it doesn't seem related to my changes. I think I might have some issue with my config. Could you double check if the tests pass for you?
/home/pep/.rvm/gems/ruby-2.3.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call': No route matches [GET] "/autocomplete/users/sjobs@apple.com.json" (ActionController::RoutingError)
## Why was this MR needed?
https://gitlab.com/gitlab-org/gitlab-ce/issues/13823
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/13823
See merge request !6818
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/dashboard/todos/index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml index 5b2465e25ee..472d698486b 100644 --- a/app/views/dashboard/todos/index.html.haml +++ b/app/views/dashboard/todos/index.html.haml @@ -84,7 +84,7 @@ = render "shared/empty_states/todos_all_done.svg" - if todos_filter_empty? %h4.text-center - Good job! Looks like you don't have any todos left. + = Gitlab.config.gitlab.no_todos_messages.sample %p.text-center Are you looking for things to do? Take a look at = succeed "," do |