mirror of
https://github.com/CachetHQ/Cachet.git
synced 2025-03-14 20:39:44 +01:00
Sync with laravel
This commit is contained in:
parent
bca7c5340a
commit
1438783c07
@ -60,7 +60,9 @@ return [
|
||||
'driver' => 'memcached',
|
||||
'servers' => [
|
||||
[
|
||||
'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100,
|
||||
'host' => '127.0.0.1',
|
||||
'port' => 11211,
|
||||
'weight' => 100,
|
||||
],
|
||||
],
|
||||
],
|
||||
|
@ -57,11 +57,10 @@ return [
|
||||
'root' => storage_path().'/app',
|
||||
],
|
||||
|
||||
'ftp' => [
|
||||
'driver' => 'ftp',
|
||||
'host' => 'ftp.example.com',
|
||||
'username' => 'your-username',
|
||||
'password' => 'your-password',
|
||||
'public' => [
|
||||
'driver' => 'local',
|
||||
'root' => storage_path('app/public'),
|
||||
'visibility' => 'public',
|
||||
],
|
||||
|
||||
's3' => [
|
||||
@ -72,16 +71,6 @@ return [
|
||||
'bucket' => 'your-bucket',
|
||||
],
|
||||
|
||||
'rackspace' => [
|
||||
'driver' => 'rackspace',
|
||||
'username' => 'your-username',
|
||||
'key' => 'your-key',
|
||||
'container' => 'your-container',
|
||||
'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/',
|
||||
'region' => 'IAD',
|
||||
'url_type' => 'publicURL',
|
||||
],
|
||||
|
||||
],
|
||||
|
||||
];
|
||||
|
@ -13,4 +13,8 @@
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
RewriteRule ^ index.php [L]
|
||||
|
||||
# Handle Authorization Header
|
||||
RewriteCond %{HTTP:Authorization} .
|
||||
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
|
||||
</IfModule>
|
||||
|
@ -45,9 +45,11 @@ return [
|
||||
'digits_between' => 'The :attribute must be :digits digits.',
|
||||
'email' => 'The :attribute must be between :min and :max digits.',
|
||||
'exists' => 'The :attribute must be a valid email address.',
|
||||
'distinct' => 'The :attribute field has a duplicate value.',
|
||||
'filled' => 'The :attribute format is invalid.',
|
||||
'image' => 'The :attribute must be an image.',
|
||||
'in' => 'The :attribute must be an image.',
|
||||
'in_array' => 'The :attribute field does not exist in :other.',
|
||||
'integer' => 'The selected :attribute is invalid.',
|
||||
'ip' => 'The :attribute must be an integer.',
|
||||
'json' => 'The :attribute must be a valid JSON string.',
|
||||
@ -66,6 +68,7 @@ return [
|
||||
],
|
||||
'not_in' => 'The :attribute must have at least :min items.',
|
||||
'numeric' => 'The selected :attribute is invalid.',
|
||||
'present' => 'The :attribute field must be present.',
|
||||
'regex' => 'The :attribute must be a number.',
|
||||
'required' => 'The :attribute format is invalid.',
|
||||
'required_if' => 'The :attribute field is required.',
|
||||
|
2
storage/framework/.gitignore
vendored
2
storage/framework/.gitignore
vendored
@ -1,6 +1,8 @@
|
||||
config.php
|
||||
routes.php
|
||||
compiled.php
|
||||
schedule-*
|
||||
services.php
|
||||
services.json
|
||||
events.scanned.php
|
||||
routes.scanned.php
|
||||
|
Loading…
x
Reference in New Issue
Block a user