diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
| commit | eb39db7f93061c936fcb0bb24d5ba0c9a6186993 (patch) | |
| tree | e12b5f5c9fec1d698024c88cd9f3ea9fe5b249cd /app/controllers/api/v1/statuses | |
| parent | f0bb3ff53307aac7b9c64ec8a48d4ba1d2019513 (diff) | |
| parent | f890d2a766ae4c7fd8611dd4f3a15a13408f68c3 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml
Diffstat (limited to 'app/controllers/api/v1/statuses')
| -rw-r--r-- | app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb index f95cf9457..3fe304153 100644 --- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb +++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb @@ -77,6 +77,6 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController end def pagination_params(core_params) - params.permit(:limit).merge(core_params) + params.slice(:limit).permit(:limit).merge(core_params) end end diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb index 175217e6e..b065db2c7 100644 --- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb +++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb @@ -74,6 +74,6 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController end def pagination_params(core_params) - params.permit(:limit).merge(core_params) + params.slice(:limit).permit(:limit).merge(core_params) end end |