-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy pathv6.18.3...v6.20.1.diff
146 lines (139 loc) · 6.17 KB
/
v6.18.3...v6.20.1.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e92713c8..7b415b90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,47 @@
# Release Notes
-## [Unreleased](https://github.com/laravel/laravel/compare/v6.18.3...6.x)
+## [Unreleased](https://github.com/laravel/laravel/compare/v6.20.1...6.x)
+
+
+## [v6.20.1 (2021-05-11)](https://github.com/laravel/laravel/compare/v6.20.0...v6.20.1)
+
+### Security
+- Target 1.16.15 of facade/ignition ([#5544](https://github.com/laravel/laravel/pull/5544))
+- Bump framework version to include SQL server security fix ([#5602](https://github.com/laravel/laravel/pull/5602))
+
+
+## [v6.20.0 (2020-10-30)](https://github.com/laravel/laravel/compare/v6.19.0...v6.20.0)
+
+### Changed
+- Bumped several dependencies
+
+
+## [v6.19.0 (2020-10-29)](https://github.com/laravel/laravel/compare/v6.18.8...v6.19.0)
+
+### Added
+- PHP 8 Support ([4c25cb9](https://github.com/laravel/laravel/commit/4c25cb953a0bbd4812bf92af71a13920998def1e))
+
+### Changed
+- Bump minimum PHP version ([#5452](https://github.com/laravel/laravel/pull/5452))
+- Update Faker ([#5461](https://github.com/laravel/laravel/pull/5461))
+- Update minimum Laravel version ([b8d5825](https://github.com/laravel/laravel/commit/b8d582581a1067e3b1715cce477b22455acc3d36))
+
+### Fixed
+- Delete removed webpack flag ([#5460](https://github.com/laravel/laravel/pull/5460))
+
+
+## [v6.18.35 (2020-08-11)](https://github.com/laravel/laravel/compare/v6.18.8...v6.18.35)
+
+### Changed
+- Set framework version to `^6.18.35` ([#5369](https://github.com/laravel/laravel/pull/5369))
+- Bump lodash from 4.17.15 to 4.17.19 ([f465c51](https://github.com/laravel/laravel/commit/f465c511c009235fc7bfa06bfcb41294e60e9b42))
+- Disable webpack-dev-server host check ([#5288](https://github.com/laravel/laravel/pull/5288))
+
+
+## [v6.18.8 (2020-04-16)](https://github.com/laravel/laravel/compare/v6.18.3...v6.18.8)
+
+### Fixed
+- Add both endpoint and url env variables ([#5276](https://github.com/laravel/laravel/pull/5276))
## [v6.18.3 (2020-03-24)](https://github.com/laravel/laravel/compare/v6.18.0...v6.18.3)
diff --git a/README.md b/README.md
index 81f2f62b..4e2cadb6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><img src="https://res.cloudinary.com/dtfbvvkyp/image/upload/v1566331377/laravel-logolockup-cmyk-red.svg" width="400"></p>
+<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400"></a></p>
<p align="center">
<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
diff --git a/composer.json b/composer.json
index 4ed8c09f..65cd1084 100644
--- a/composer.json
+++ b/composer.json
@@ -8,17 +8,17 @@
],
"license": "MIT",
"require": {
- "php": "^7.2",
- "fideloper/proxy": "^4.0",
- "laravel/framework": "^6.2",
- "laravel/tinker": "^2.0"
+ "php": "^7.2.5|^8.0",
+ "fideloper/proxy": "^4.4",
+ "laravel/framework": "^6.20.26",
+ "laravel/tinker": "^2.5"
},
"require-dev": {
- "facade/ignition": "^1.4",
- "fzaninotto/faker": "^1.9.1",
+ "facade/ignition": "^1.16.15",
+ "fakerphp/faker": "^1.9.1",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^3.0",
- "phpunit/phpunit": "^8.0"
+ "phpunit/phpunit": "^8.5.8|^9.3.3"
},
"config": {
"optimize-autoloader": true,
diff --git a/config/filesystems.php b/config/filesystems.php
index a0ec1290..220c0104 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -61,7 +61,8 @@ return [
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'region' => env('AWS_DEFAULT_REGION'),
'bucket' => env('AWS_BUCKET'),
- 'endpoint' => env('AWS_URL'),
+ 'url' => env('AWS_URL'),
+ 'endpoint' => env('AWS_ENDPOINT'),
],
],
diff --git a/package.json b/package.json
index 3729fb78..557bd215 100644
--- a/package.json
+++ b/package.json
@@ -2,18 +2,18 @@
"private": true,
"scripts": {
"dev": "npm run development",
- "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+ "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "npm run development -- --watch",
"watch-poll": "npm run watch -- --watch-poll",
- "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+ "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production",
- "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+ "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"axios": "^0.19",
"cross-env": "^7.0",
"laravel-mix": "^5.0.1",
- "lodash": "^4.17.13",
+ "lodash": "^4.17.19",
"resolve-url-loader": "^3.1.0",
"sass": "^1.15.2",
"sass-loader": "^8.0.0"
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 3fb48cc0..7bc33725 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -7,7 +7,7 @@
<title>Laravel</title>
<!-- Fonts -->
- <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet">
+ <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@200;600&display=swap" rel="stylesheet">
<!-- Styles -->
<style>