Merge branch 'master' into fix-for-ransack-deprecated-method

This commit is contained in:
Dinar Safiulin 2021-09-14 13:50:18 +03:00 committed by GitHub
commit 9cafc98482
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
171 changed files with 1061 additions and 726 deletions

View file

@ -63,7 +63,12 @@ module Admin
def admin_user_params
params.require(:admin_user).permit(:username,
:password, :password_confirmation, :identity_code, :email, :country_code, { roles: [] })
:password,
:password_confirmation,
:identity_code,
:email,
:country_code,
{ roles: [] })
end
end
end