Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-04-19 14:10:25 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-04-20 22:43:32 +0300
commit159f959b6106a750d0ab89dce95a954ee33ffa84 (patch)
tree02594451a542a06e0fe6a3e594a74644fe784fc1 /app/finders
parent6cdf4acd4eef55c616d633757772c6e05f6b93c5 (diff)
Move due_date sort scopes to Issue and fix CHANGELOG
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/issuable_finder.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index e21cfbd0d47..88ddeefa079 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -114,7 +114,7 @@ class IssuableFinder
end
def due_date?
- params[:due_date].present?
+ params[:due_date].present? && klass.column_names.include?('due_date')
end
def filter_by_no_due_date?
@@ -305,8 +305,6 @@ class IssuableFinder
end
def by_due_date(items)
- return items unless klass.column_names.include?('due_date')
-
if due_date?
if filter_by_no_due_date?
items = items.without_due_date