about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authoralpaca-tc <alpaca-tc@alpaca.tc>2017-05-16 10:35:17 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-05-16 03:35:17 +0200
commit09ec6e504be96a8bef72c9d988099191501dde67 (patch)
treee34d244fc70db98fc5cc59ed8309fa3ba9dcb10f /app/models
parenta2a2af244cf64659870e0547f0b0123ce0571a16 (diff)
Order by symbol value (#3077)
Diffstat (limited to 'app/models')
-rw-r--r--app/models/media_attachment.rb2
-rw-r--r--app/models/user.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index d18ebabd4..3277eb227 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -53,7 +53,7 @@ class MediaAttachment < ApplicationRecord
 
   scope :attached, -> { where.not(status_id: nil) }
   scope :local, -> { where(remote_url: '') }
-  default_scope { order('id asc') }
+  default_scope { order(id: :asc) }
 
   def local?
     remote_url.blank?
diff --git a/app/models/user.rb b/app/models/user.rb
index dfecb2339..66a8edfc1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -48,7 +48,7 @@ class User < ApplicationRecord
   validates :locale, inclusion: I18n.available_locales.map(&:to_s), unless: 'locale.nil?'
   validates :email, email: true
 
-  scope :recent,    -> { order('id desc') }
+  scope :recent,    -> { order(id: :desc) }
   scope :admins,    -> { where(admin: true) }
   scope :confirmed, -> { where.not(confirmed_at: nil) }