Skip to content

Commit fb924e3

Browse files
committed
Merge branch 'development'
2 parents 08f5971 + 64fd927 commit fb924e3

File tree

3 files changed

+24
-6
lines changed

3 files changed

+24
-6
lines changed

CHANGELOG.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,20 @@ All notable changes to this project will be documented in this file.
33

44
## [Unreleased]
55

6-
## 7.2.0 - 2020-07-25
6+
## [7.2.2] - 2020-07-26
7+
8+
## Changed
9+
10+
- Update Laravel security patch
11+
- Update proxy and mockery min versions
12+
13+
## [7.2.1] - 2020-07-26
14+
15+
## Changed
16+
17+
- Update for Laravel security patch
18+
19+
## [7.2.0] - 2020-07-25
720

821
## Added
922

@@ -300,7 +313,12 @@ Started from scratch with a blank Laravel 7.* installation. This release is not
300313
- Fix yarn tests
301314
- Fix: Socially logged in users get assigned the default role
302315

303-
[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.3...development
316+
[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.2...development
317+
[7.2.2]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.1...v7.2.2
318+
[7.2.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.0...v7.2.1
319+
[7.2.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.1.1...v7.2.0
320+
[7.1.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.1.0...v7.1.1
321+
[7.1.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.3...v7.1.0
304322
[7.0.3]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.2...v7.0.3
305323
[7.0.2]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.1...v7.0.2
306324
[7.0.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.0...v7.0.1

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"albertcht/invisible-recaptcha": "^1.9",
1414
"arcanedev/log-viewer": "7.x",
1515
"darkghosthunter/laraguard": "^2.0",
16-
"fideloper/proxy": "^4.0",
16+
"fideloper/proxy": "^4.2",
1717
"fruitcake/laravel-cors": "^2.0",
1818
"guzzlehttp/guzzle": "^6.3",
1919
"jamesmills/laravel-timezone": "^1.9",
2020
"lab404/laravel-impersonate": "^1.6",
2121
"langleyfoxall/laravel-nist-password-rules": "^4.1",
22-
"laravel/framework": "^7.0",
22+
"laravel/framework": "^7.22.4",
2323
"laravel/socialite": "^4.3",
2424
"laravel/tinker": "^2.0",
2525
"laravel/ui": "^2.0",
@@ -37,7 +37,7 @@
3737
"facade/ignition": "^2.0",
3838
"friendsofphp/php-cs-fixer": "^2.16",
3939
"fzaninotto/faker": "^1.9.1",
40-
"mockery/mockery": "^1.0",
40+
"mockery/mockery": "^1.3.1",
4141
"nunomaduro/collision": "^4.1",
4242
"phpunit/phpunit": "^8.5"
4343
},

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)