mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 13:33:21 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse source 
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
This commit is contained in:
David Yip 2018-04-01 20:24:50 -05:00
commit eb39db7f93
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
82 changed files with 753 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/notifications_controller.rb
View file

@ -91,6 +91,6 @@ class Api::V1::NotificationsController < Api::BaseController
end
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