diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-21 15:25:00 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-21 15:25:00 +0000 |
commit | 1974691bfe372f805a635319a8f7dbd6e0537485 (patch) | |
tree | bd4bf0c17f74e6b12c1859f0b87dc76a545c7222 /app/finders | |
parent | db8f52d4014b489eb11c8408db262a9329c8800d (diff) | |
download | gitlab-ce-1974691bfe372f805a635319a8f7dbd6e0537485.tar.gz |
Revert "Merge branch '29534-todos-performance' into 'master'"
This reverts merge request !10076
Diffstat (limited to 'app/finders')
-rw-r--r-- | app/finders/todos_finder.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb index 13d33a1c31b..b7f091f334d 100644 --- a/app/finders/todos_finder.rb +++ b/app/finders/todos_finder.rb @@ -24,7 +24,6 @@ class TodosFinder def execute items = current_user.todos - items = include_associations(items) items = by_action_id(items) items = by_action(items) items = by_author(items) @@ -39,17 +38,6 @@ class TodosFinder private - def include_associations(items) - return items unless params[:include_associations] - - items.includes( - [ - target: { project: [:route, namespace: :route] }, - author: { namespace: :route }, - ] - ) - end - def action_id? action_id.present? && Todo::ACTION_NAMES.has_key?(action_id.to_i) end |