Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2016-07-28 09:16:46 -07:00
commit fae9755ffb

View file

@ -26,7 +26,6 @@ class SaveUserRequest extends Request
return [ return [
'first_name' => 'required|string|min:1', 'first_name' => 'required|string|min:1',
'last_name' => 'required|string|min:1', 'last_name' => 'required|string|min:1',
'username' => 'required|string|min:2|unique:users,username,NULL,deleted_at',
'email' => 'email', 'email' => 'email',
'password' => 'required|min:6', 'password' => 'required|min:6',
'password_confirm' => 'sometimes|required_with:password', 'password_confirm' => 'sometimes|required_with:password',