summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-17 18:50:49 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-19 14:58:27 -0200
commit301264beada6aaf7dd0e4244c3f41131f9b4f359 (patch)
treede00bc60a51a0e55880096d7a1d2f5e97946d4ba
parent928acba4c0ae31626dac621f0f240f18cbad548a (diff)
downloadgitlab-ce-301264beada6aaf7dd0e4244c3f41131f9b4f359.tar.gz
Fix sorting merge requests by priority
-rw-r--r--app/models/concerns/issuable.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 245a865bcba..9a9b562af02 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -145,10 +145,16 @@ module Issuable
end
def order_labels_priority(excluded_labels: [])
+ project_column =
+ case table_name
+ when Issue.table_name then "#{table_name}.project_id"
+ when MergeRequest.table_name then "#{table_name}.target_project_id"
+ end
+
params = {
target_type: name,
target_column: "#{table_name}.id",
- project_column: "#{table_name}.project_id",
+ project_column: project_column,
excluded_labels: excluded_labels
}