Merge branch 'develop' into feature/api-v1

This commit is contained in:
Dane Everitt 2018-01-21 17:06:31 -06:00
commit 407120a854
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
13 changed files with 75 additions and 31 deletions

View file

@ -18,7 +18,6 @@ class EggVariableFormRequest extends AdminFormRequest
'name' => 'required|string|min:1|max:255',
'description' => 'sometimes|nullable|string',
'env_variable' => 'required|regex:/^[\w]{1,255}$/|notIn:' . EggVariable::RESERVED_ENV_NAMES,
'default_value' => 'nullable|string',
'options' => 'sometimes|required|array',
'rules' => 'bail|required|string',
];