summaryrefslogtreecommitdiff
path: root/app/models/issue.rb
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-09-25 13:13:32 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-09-25 13:13:32 +0100
commit6a9258928ee39ade0e73d6104b899bd95350e83d (patch)
tree6f6cea18448820e68824d40c1e29960c67e038f2 /app/models/issue.rb
parent7b3e29c53b21225c5714b635aa0abde3dfcdfb03 (diff)
parent8b1a3d40e76093ff6ffd28a6e08280f4b29afc8e (diff)
downloadgitlab-ce-34371-cycle-analitcs-components-vue.tar.gz
Merge branch 'master' into 34371-cycle-analitcs-components-vue34371-cycle-analitcs-components-vue
* master: Removes cycle analytics service and store from global namespace Migrate Gitlab::Git::Repository#log to Gitaly Update tests to reflect `user_avatar_without_link` helper changes Add instructions for upgrading from CE to EE using GitLab Omnibus chart - docs Add `data-src` when image is to be lazy loaded, use `tag` helper instead of `image_tag` helper Remove unnecessary use of `gsub` Fixed few gitlab:check tasks that were failing with exception Update CHANGELOG.md for 10.0.1 Remove Grit settings from default settings Improve list of sorting options Remove navbar gradient spec fixes Fixed fly-out error if mousePos array is empty Refactor spec/policies/project_policy_spec.rb to minimize the diff with EE Make the "customizes the whitelist only once" spec less brittle Re-allow `name` attribute on user-provided anchor HTML simplify link_to call Fixes dashboard/projects empty state showing when viewing personal projects Add context tabs to dashboard/projects fix minor spelling mistakes
Diffstat (limited to 'app/models/issue.rb')
-rw-r--r--app/models/issue.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 92a454300af..155c5d972b7 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -116,7 +116,8 @@ class Issue < ActiveRecord::Base
def self.sort(method, excluded_labels: [])
case method.to_s
- when 'due_date_asc' then order_due_date_asc
+ when 'due_date' then order_due_date_asc
+ when 'due_date_asc' then order_due_date_asc
when 'due_date_desc' then order_due_date_desc
else
super