summaryrefslogtreecommitdiff
path: root/app/models/todo.rb
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2016-10-27 21:26:56 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2016-10-27 21:26:56 -0300
commit7bd6ff03d8cc08673497e3b574efce1648f27da0 (patch)
treebb7022f70629314644270849c5c40da01ecf3f8e /app/models/todo.rb
parent20a7db4483904c7280093a0309a63dfd1b7ef72e (diff)
downloadgitlab-ce-7bd6ff03d8cc08673497e3b574efce1648f27da0.tar.gz
Fix and improve `Sortable.highest_label_priority`23928-sortable-highest_label_priority-is-bugged
Diffstat (limited to 'app/models/todo.rb')
-rw-r--r--app/models/todo.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/todo.rb b/app/models/todo.rb
index 11c072dd000..f5ade1cc293 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -53,7 +53,7 @@ class Todo < ActiveRecord::Base
# Need to order by created_at last because of differences on Mysql and Postgres when joining by type "Merge_request/Issue"
def order_by_labels_priority
params = {
- target_type: ['Issue', 'MergeRequest'],
+ target_type_column: "todos.target_type",
target_column: "todos.target_id",
project_column: "todos.project_id"
}