summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-07-12 20:28:59 +0000
committerRobert Speicher <robert@gitlab.com>2016-07-12 20:28:59 +0000
commit0533a7d80c2fcf9c4e74adc386f4a5e93d3694e0 (patch)
treefd688d56897915aab516a92148aa0c333a5a9185
parent1d958b035d944383fcde88cfd5c856c830e4fb2e (diff)
parent0ec69815868f77526bd5a2c060d22fbe272af9ea (diff)
downloadgitlab-ce-0533a7d80c2fcf9c4e74adc386f4a5e93d3694e0.tar.gz
Merge branch 'rs-delimit-done-todos' into 'master'
Use number_with_delimiter for Todos pending/done tab counts See merge request !5199
-rw-r--r--app/views/dashboard/todos/index.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index fc42e5dcc66..4e340b6ec16 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -9,14 +9,14 @@
%span
To do
%span.badge
- = todos_pending_count
+ = number_with_delimiter(todos_pending_count)
- todo_done_active = ('active' if params[:state] == 'done')
%li{class: "todos-done #{todo_done_active}"}
= link_to todos_filter_path(state: 'done') do
%span
Done
%span.badge
- = todos_done_count
+ = number_with_delimiter(todos_done_count)
.nav-controls
- if @todos.any?(&:pending?)