Skip to content

Commit db596ba

Browse files
committed
Merge branch 'develop' of github.com:laravel/laravel into develop
2 parents ffc74ba + b1f3578 commit db596ba

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.env.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DB_PASSWORD=
1616
BROADCAST_DRIVER=log
1717
CACHE_DRIVER=file
1818
QUEUE_CONNECTION=sync
19-
SESSION_DRIVER=cookie
19+
SESSION_DRIVER=file
2020
SESSION_LIFETIME=120
2121

2222
REDIS_HOST=127.0.0.1

config/session.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
|
1919
*/
2020

21-
'driver' => env('SESSION_DRIVER', 'cookie'),
21+
'driver' => env('SESSION_DRIVER', 'file'),
2222

2323
/*
2424
|--------------------------------------------------------------------------

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"devDependencies": {
1313
"axios": "^0.19",
1414
"cross-env": "^5.1",
15-
"laravel-mix": "^4.0.7",
15+
"laravel-mix": "^5.0.1",
1616
"lodash": "^4.17.13",
1717
"resolve-url-loader": "^2.3.1",
1818
"sass": "^1.15.2",
19-
"sass-loader": "^7.1.0"
19+
"sass-loader": "^8.0.0"
2020
}
2121
}

resources/lang/en/validation.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
'dimensions' => 'The :attribute has invalid image dimensions.',
4141
'distinct' => 'The :attribute field has a duplicate value.',
4242
'email' => 'The :attribute must be a valid email address.',
43-
'ends_with' => 'The :attribute must end with one of the following: :values',
43+
'ends_with' => 'The :attribute must end with one of the following: :values.',
4444
'exists' => 'The selected :attribute is invalid.',
4545
'file' => 'The :attribute must be a file.',
4646
'filled' => 'The :attribute field must have a value.',
@@ -110,7 +110,7 @@
110110
'string' => 'The :attribute must be :size characters.',
111111
'array' => 'The :attribute must contain :size items.',
112112
],
113-
'starts_with' => 'The :attribute must start with one of the following: :values',
113+
'starts_with' => 'The :attribute must start with one of the following: :values.',
114114
'string' => 'The :attribute must be a string.',
115115
'timezone' => 'The :attribute must be a valid zone.',
116116
'unique' => 'The :attribute has already been taken.',

0 commit comments

Comments
 (0)