Merge branch 'develop' into dev_trustie_server

This commit is contained in:
jasder
2021-10-21 14:41:43 +08:00
53 changed files with 1991 additions and 108 deletions

View File

@@ -0,0 +1,5 @@
json.user do
json.partial! 'users/user_simple', locals: { user: setting.user }
end
json.notification_body setting.notification_body
json.email_body setting.email_body

View File

@@ -0,0 +1,2 @@
json.partial! "commons/success"
json.partial! "detail", locals: {setting: @current_setting}

View File

@@ -0,0 +1,2 @@
json.partial! "commons/success"
json.partial! "detail", locals: {setting: @current_setting}