Fix unpermitted parameters warning when generating pagination URLs (#6995)

pull/6998/head
Eugen Rochko 2018-04-02 02:09:50 +02:00 committed by GitHub
parent 123a343d11
commit 33513753b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 17 additions and 17 deletions

View File

@ -63,6 +63,6 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end
end end

View File

@ -63,6 +63,6 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end
end end

View File

@ -69,7 +69,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit, :only_media, :exclude_replies).merge(core_params) params.slice(:limit, :only_media, :exclude_replies).permit(:limit, :only_media, :exclude_replies).merge(core_params)
end end
def insert_pagination_headers def insert_pagination_headers

View File

@ -57,6 +57,6 @@ class Api::V1::BlocksController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end
end end

View File

@ -67,7 +67,7 @@ class Api::V1::DomainBlocksController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end
def domain_block_params def domain_block_params

View File

@ -66,6 +66,6 @@ class Api::V1::FavouritesController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end
end end

View File

@ -71,6 +71,6 @@ class Api::V1::FollowRequestsController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end
end end

View File

@ -88,7 +88,7 @@ class Api::V1::Lists::AccountsController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end
def unlimited? def unlimited?

View File

@ -59,6 +59,6 @@ class Api::V1::MutesController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end
end end

View File

@ -82,6 +82,6 @@ class Api::V1::NotificationsController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit, exclude_types: []).merge(core_params) params.slice(:limit, :exclude_types).permit(:limit, exclude_types: []).merge(core_params)
end end
end end

View File

@ -77,6 +77,6 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end
end end

View File

@ -74,6 +74,6 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end
end end

View File

@ -76,7 +76,7 @@ class Api::V1::StatusesController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end
def authorize_if_got_token def authorize_if_got_token

View File

@ -43,7 +43,7 @@ class Api::V1::Timelines::HomeController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:local, :limit).merge(core_params) params.slice(:local, :limit).permit(:local, :limit).merge(core_params)
end end
def next_path def next_path

View File

@ -45,7 +45,7 @@ class Api::V1::Timelines::ListController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end
def next_path def next_path

View File

@ -45,7 +45,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:local, :limit, :only_media).merge(core_params) params.slice(:local, :limit, :only_media).permit(:local, :limit, :only_media).merge(core_params)
end end
def next_path def next_path

View File

@ -54,7 +54,7 @@ class Api::V1::Timelines::TagController < Api::BaseController
end end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:local, :limit, :only_media).merge(core_params) params.slice(:local, :limit, :only_media).permit(:local, :limit, :only_media).merge(core_params)
end end
def next_path def next_path