mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 09:05:06 +01:00
Code Issues Projects Releases Wiki Activity

Order by symbol value (#3077)

Browse Source
This commit is contained in:
alpaca-tc 2017-05-16 10:35:17 +09:00 committed by Eugen Rochko
parent a2a2af244c
commit 09ec6e504b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/media_attachment.rb
View File

@ -53,7 +53,7 @@ class MediaAttachment < ApplicationRecord
scope :attached, -> { where.not(status_id: nil) } scope :attached, -> { where.not(status_id: nil) }
scope :local, -> { where(remote_url: '') } scope :local, -> { where(remote_url: '') }
default_scope { order('id asc') } default_scope { order(id: :asc) }
def local? def local?
remote_url.blank? remote_url.blank?

2
app/models/user.rb
View File

@ -48,7 +48,7 @@ class User < ApplicationRecord
validates :locale, inclusion: I18n.available_locales.map(&:to_s), unless: 'locale.nil?' validates :locale, inclusion: I18n.available_locales.map(&:to_s), unless: 'locale.nil?'
validates :email, email: true validates :email, email: true
scope :recent, -> { order('id desc') } scope :recent, -> { order(id: :desc) }
scope :admins, -> { where(admin: true) } scope :admins, -> { where(admin: true) }
scope :confirmed, -> { where.not(confirmed_at: nil) } scope :confirmed, -> { where.not(confirmed_at: nil) }