commit: 1b0a5658f15eeca0934a892d95dd93222d8da583
parent: 682b68438e7b9c1755151777bbb6849c00ca98e4
Author: masarakki <masaki182@gmail.com>
Date: Tue, 16 May 2017 19:10:09 +0900
use-symbol-in-order (#3081)
Diffstat:
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
@@ -6,12 +6,12 @@ class AccountsController < ApplicationController
def show
respond_to do |format|
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)
end
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))
end
diff --git a/app/controllers/admin/pubsubhubbub_controller.rb b/app/controllers/admin/pubsubhubbub_controller.rb
@@ -3,7 +3,7 @@
module Admin
class PubsubhubbubController < BaseController
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
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
@@ -49,7 +49,7 @@ module Admin
end
def filtered_reports
- ReportFilter.new(filter_params).results.order('id desc').includes(
+ ReportFilter.new(filter_params).results.order(id: :desc).includes(
:account,
:target_account
)