diff options
author | Felipe Artur <felipefac@gmail.com> | 2016-05-31 19:33:46 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2016-05-31 19:33:46 -0300 |
commit | 56f3b243ce08d105758a9b6edf96792627fa423c (patch) | |
tree | 6b8f0a2e47b5c3d43d34c2c2b25e1596ea7e501f /app/models | |
parent | 30e61ed79c89de4c31a4d2057f710ad2b0704389 (diff) | |
download | gitlab-ce-56f3b243ce08d105758a9b6edf96792627fa423c.tar.gz |
Add leading comment space copissue_15557
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/concerns/issuable.rb | 13 | ||||
-rw-r--r-- | app/models/key.rb | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 117d66131ae..9aaaf787372 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -128,7 +128,7 @@ module Issuable def with_label(title, sort = nil) if title.is_a?(Array) && title.size > 1 - joins(:labels).where(labels: { title: title }).group(*get_grouping_columns(sort)).having("COUNT(DISTINCT labels.title) = #{title.size}") + joins(:labels).where(labels: { title: title }).group(*grouping_columns(sort)).having("COUNT(DISTINCT labels.title) = #{title.size}") else joins(:labels).where(labels: { title: title }) end @@ -138,17 +138,16 @@ module Issuable # preventing errors in postgres # # Returns an array of arel columns - - def get_grouping_columns(sort) - default_columns = [arel_table[:id]] + def grouping_columns(sort) + grouping_columns = [arel_table[:id]] if ["milestone_due_desc", "milestone_due_asc"].include?(sort) milestone_table = Milestone.arel_table - default_columns << milestone_table[:id] - default_columns << milestone_table[:due_date] + grouping_columns << milestone_table[:id] + grouping_columns << milestone_table[:due_date] end - default_columns + grouping_columns end end diff --git a/app/models/key.rb b/app/models/key.rb index d52afda67d1..0532e84f47d 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -26,7 +26,7 @@ class Key < ActiveRecord::Base end def publishable_key - #Removes anything beyond the keytype and key itself + # Removes anything beyond the keytype and key itself self.key.split[0..1].join(' ') end |