Douwe Maan b218e82b5c Merge branch 'issuable-todo-improvements' ... # Conflicts: # app/controllers/projects/todos_controller.rb		2016-06-18 00:42:36 +02:00
..
assets	Merge branch 'issuable-todo-improvements'	2016-06-18 00:42:36 +02:00
controllers	Merge branch 'issuable-todo-improvements'	2016-06-18 00:42:36 +02:00
finders	Ensure Todos counters doesn't count Todos for projects pending delete	2016-06-17 16:17:43 -03:00
helpers	Merge branch 'issuable-todo-improvements'	2016-06-18 00:42:36 +02:00
mailers	fixed merge conflicts on UI branch	2016-06-16 15:01:27 +02:00
models	Cache todo counters (pending/done)	2016-06-17 19:04:36 +02:00
services	Merge branch '18034-cache-todo-counter' into 'master'	2016-06-17 18:37:43 +00:00
uploaders	…
validators	…
views	Merge branch 'issuable-todo-improvements'	2016-06-18 00:42:36 +02:00
workers	Merge branch 'repo-check-require-push-events' into 'master'	2016-06-17 19:14:43 +00:00