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
This commit is contained in:
commit
f4710ee83c
5 changed files with 22 additions and 4 deletions
|
@ -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
|
||||
|
|
4
changelogs/unreleased/issue-13823.yml
Normal file
4
changelogs/unreleased/issue-13823.yml
Normal file
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Show random messages when the To Do list is empty
|
||||
merge_request: 6818
|
||||
author: Josep Llaneras
|
|
@ -215,6 +215,7 @@ Settings.gitlab.default_projects_features['visibility_level'] = Settings.send(
|
|||
Settings.gitlab['domain_whitelist'] ||= []
|
||||
Settings.gitlab['import_sources'] ||= %w[github bitbucket gitlab google_code fogbugz git gitlab_project]
|
||||
Settings.gitlab['trusted_proxies'] ||= []
|
||||
Settings.gitlab['no_todos_messages'] ||= YAML.load_file(Rails.root.join('config', 'no_todos_messages.yml'))
|
||||
|
||||
#
|
||||
# CI
|
||||
|
|
13
config/no_todos_messages.yml
Normal file
13
config/no_todos_messages.yml
Normal file
|
@ -0,0 +1,13 @@
|
|||
# When the Todos list on the user's dashboard becomes empty, one of the messages below shows up randomly.
|
||||
#
|
||||
# If you come up with a fun one, please feel free to contribute it to GitLab!
|
||||
# https://about.gitlab.com/contributing/
|
||||
|
||||
---
|
||||
- Good job! Looks like you don't have any todos left.
|
||||
- Coffee really tastes better without any todos left.
|
||||
- Isn't an empty To Do list beautiful?
|
||||
- Time for a rewarding coffee break
|
||||
- Give yourself a pat on the back!
|
||||
- High five!
|
||||
- Hence forth you shall be known as 'Todo Destroyer'
|
|
@ -44,7 +44,7 @@ describe 'Dashboard Todos', feature: true do
|
|||
end
|
||||
|
||||
it 'shows "All done" message' do
|
||||
expect(page).to have_content("Good job! Looks like you don't have any todos left.")
|
||||
expect(page).to have_selector('.todos-all-done', count: 1)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -64,7 +64,7 @@ describe 'Dashboard Todos', feature: true do
|
|||
end
|
||||
|
||||
it 'shows "All done" message' do
|
||||
expect(page).to have_content("Good job! Looks like you don't have any todos left.")
|
||||
expect(page).to have_selector('.todos-all-done', count: 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -152,7 +152,7 @@ describe 'Dashboard Todos', feature: true do
|
|||
within('.todos-pending-count') { expect(page).to have_content '0' }
|
||||
expect(page).to have_content 'To do 0'
|
||||
expect(page).to have_content 'Done 0'
|
||||
expect(page).to have_content "Good job! Looks like you don't have any todos left."
|
||||
expect(page).to have_selector('.todos-all-done', count: 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue