Skip to content

Commit f355125

Browse files
committed
Merge branch 'release/6.0.1'
2 parents 89bfd74 + 9661a6e commit f355125

File tree

11 files changed

+1336
-730
lines changed

11 files changed

+1336
-730
lines changed

CHANGELOG.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file.
33

44
## [Unreleased]
55

6+
## [6.0.1] - 2019-10-22
7+
8+
### Added
9+
10+
- Added facade/ignition-code-editor to be able to edit files right from ignition screens
11+
- Added facade/ignition-self-diagnosis to for useful checklist of things that could get fixed when encountering an error
12+
- Added facade/ignition-tinker-tab which adds a tinker tab in ignition which uses laravel tinker behind the scenes to be able to use tinker right from error screens
13+
14+
### Changed
15+
16+
- Update to Laravel Commit 953b488b8bb681d4d6e12227645c7c1b7ac26935 (Without password confirmation stuff)
17+
- Fix socialite bug (https://github.com/rappasoft/laravel-boilerplate/issues/1284)
18+
619
## [6.0.0] - 2019-09-08
720
### Added
821
- Added captcha to login request
@@ -143,6 +156,7 @@ All notable changes to this project will be documented in this file.
143156
- Fix yarn tests
144157
- Fix: Socially logged in users get assigned the default role
145158

146-
[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.0...development
159+
[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.1...development
160+
[6.0.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.0...v6.0.1
147161
[6.0.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v5.3.8...v6.0.0
148162
[5.3.8]: https://github.com/rappasoft/laravel-boilerplate/compare/v5.3.7...v5.3.8

app/Http/Controllers/Frontend/Auth/ConfirmPasswordController.php

Whitespace-only changes.

app/Repositories/Frontend/Auth/UserRepository.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ public function findOrCreateProvider($data, $provider)
266266
// Get users first name and last name from their full name
267267
$nameParts = $this->getNameParts($data->getName());
268268

269-
$user = parent::create([
269+
$user = $this->model::create([
270270
'first_name' => $nameParts['first_name'],
271271
'last_name' => $nameParts['last_name'],
272272
'email' => $user_email,

composer.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,15 @@
3030
"barryvdh/laravel-ide-helper": "^2.6",
3131
"codedungeon/phpunit-result-printer": "^0.26.1",
3232
"facade/ignition": "^1.4",
33+
"facade/ignition-code-editor": "^1.0",
34+
"facade/ignition-self-diagnosis": "^1.0",
35+
"facade/ignition-tinker-tab": "^1.0",
3336
"friendsofphp/php-cs-fixer": "^2.14",
3437
"fzaninotto/faker": "^1.4",
3538
"mockery/mockery": "^1.0",
3639
"nunomaduro/collision": "^3.0",
3740
"phpunit/phpunit": "^8.0",
38-
"roave/security-advisories" : "dev-master"
41+
"roave/security-advisories": "dev-master"
3942
},
4043
"config": {
4144
"optimize-autoloader": true,

0 commit comments

Comments
 (0)