queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use-symbol-in-order (#3081)

Browse source
This commit is contained in:
masarakki 2017-05-16 19:10:09 +09:00 committed by Eugen Rochko
parent 682b68438e
commit 1b0a5658f1
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/accounts_controller.rb
View file

@ -6,12 +6,12 @@ class AccountsController < ApplicationController
def show def show
respond_to do |format| respond_to do |format|
format.html do format.html do
@statuses = @account.statuses.permitted_for(@account, current_account).order('id desc').paginate_by_max_id(20, params[:max_id], params[:since_id]) @statuses = @account.statuses.permitted_for(@account, current_account).order(id: :desc).paginate_by_max_id(20, params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses, Status) @statuses = cache_collection(@statuses, Status)
end end
format.atom do format.atom do
@entries = @account.stream_entries.order('id desc').where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id]) @entries = @account.stream_entries.order(id: :desc).where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id])
render xml: AtomSerializer.render(AtomSerializer.new.feed(@account, @entries.to_a)) render xml: AtomSerializer.render(AtomSerializer.new.feed(@account, @entries.to_a))
end end

2
app/controllers/admin/pubsubhubbub_controller.rb
View file

@ -3,7 +3,7 @@
module Admin module Admin
class PubsubhubbubController < BaseController class PubsubhubbubController < BaseController
def index def index
@subscriptions = Subscription.order('id desc').includes(:account).page(params[:page]) @subscriptions = Subscription.order(id: :desc).includes(:account).page(params[:page])
end end
end end
end end

2
app/controllers/admin/reports_controller.rb
View file

@ -49,7 +49,7 @@ module Admin
end end
def filtered_reports def filtered_reports
ReportFilter.new(filter_params).results.order('id desc').includes( ReportFilter.new(filter_params).results.order(id: :desc).includes(
:account, :account,
:target_account :target_account
) )