summaryrefslogtreecommitdiff
path: root/app/models/concerns/sortable.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-21 19:02:23 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:31:57 -0600
commit8a4d68c53e9c58ad7f8dce1494f7976292b2f929 (patch)
tree773814f7079c626cafabc229f929cafbe4d4b2e7 /app/models/concerns/sortable.rb
parent7ea641b6d0882fc782a7eb493daf8b66d076924b (diff)
downloadgitlab-ce-8a4d68c53e9c58ad7f8dce1494f7976292b2f929.tar.gz
Enable Style/ConditionalAssignment
Diffstat (limited to 'app/models/concerns/sortable.rb')
-rw-r--r--app/models/concerns/sortable.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/concerns/sortable.rb b/app/models/concerns/sortable.rb
index 7edb0acd56c..fdcb4f3ba64 100644
--- a/app/models/concerns/sortable.rb
+++ b/app/models/concerns/sortable.rb
@@ -46,10 +46,10 @@ module Sortable
where("label_links.target_id = #{target_column}").
reorder(nil)
- if target_type_column
- query = query.where("label_links.target_type = #{target_type_column}")
+ query = if target_type_column
+ query.where("label_links.target_type = #{target_type_column}")
else
- query = query.where(label_links: { target_type: target_type })
+ query.where(label_links: { target_type: target_type })
end
query = query.where.not(title: excluded_labels) if excluded_labels.present?