github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-28 11:05:43 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'master' into translations

Browse Source
This commit is contained in:
Dan Brown
2016-12-31 14:32:52 +00:00
committed by GitHub
parent c9700e38e2 286f9b0c7d
commit a24f3d7d47
8 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Auth/RegisterController.php
View File

@ -52,7 +52,7 @@ class RegisterController extends Controller
*/
public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
{
$this->middleware('guest');
$this->middleware('guest')->except(['socialCallback', 'detachSocialAccount']);
$this->socialAuthService = $socialAuthService;
$this->emailConfirmationService = $emailConfirmationService;
$this->userRepo = $userRepo;
@ -298,5 +298,4 @@ class RegisterController extends Controller
return $this->registerUser($userData, $socialAccount);
}
}