Merge branch 'main' of http://gitlab.idcjp.jp:3000/idcjp/cfmgrv3
This commit is contained in:
commit
170e8931ce
@ -19,7 +19,11 @@ class AuthController extends APIController
|
|||||||
'fields' => ['id', 'authkey', 'status'],
|
'fields' => ['id', 'authkey', 'status'],
|
||||||
'fieldFilters' => ['status'],
|
'fieldFilters' => ['status'],
|
||||||
'fieldRules' => [
|
'fieldRules' => [
|
||||||
|
<<<<<<< HEAD
|
||||||
'id' => 'required|valid_email|is_unique[cloudflareauth.id]',
|
'id' => 'required|valid_email|is_unique[cloudflareauth.id]',
|
||||||
|
=======
|
||||||
|
'id' => 'required|valid_email|is_unique[cloudfalreauth.id]',
|
||||||
|
>>>>>>> 7a1ac9e12bcf17ab3a24e56840567972bd755755
|
||||||
'authkey' => 'required|min_length[10]|max_length[200]',
|
'authkey' => 'required|min_length[10]|max_length[200]',
|
||||||
'status' => 'required|in_list[use,unuse]',
|
'status' => 'required|in_list[use,unuse]',
|
||||||
],
|
],
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user