From 09ec6e504be96a8bef72c9d988099191501dde67 Mon Sep 17 00:00:00 2001 From: alpaca-tc <alpaca-tc@alpaca.tc> Date: Tue, 16 May 2017 10:35:17 +0900 Subject: [PATCH] Order by symbol value (#3077) --- app/models/media_attachment.rb | 2 +- app/models/user.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index d18ebabd41..3277eb2276 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 dfecb2339f..66a8edfc15 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) }