Commit 93dc049
committed
Merge branch '0.4' into revert/server-reloader
# Conflicts:
# src/cookie/src/CookieServiceProvider.php
# src/fortify/src/FortifyServiceProvider.php
# src/routing/src/RoutingServiceProvider.php
# src/sentry/src/SentryServiceProvider.php
# src/telescope/src/Storage/DatabaseEntriesRepository.php
# src/telescope/src/TelescopeServiceProvider.php
# tests/Database/DatabaseServiceProviderTest.php
# tests/Foundation/Listeners/ReloadDotenvAndConfigTest.php
# tests/Hashing/HashingServiceProviderTest.php
# tests/Mail/MailServiceProviderTest.php
# tests/Permission/PermissionServiceProviderTest.php
# tests/Routing/RoutingServiceProviderTest.php
# tests/Saloon/SaloonServiceProviderTest.php
# tests/Scout/Unit/ScoutServiceProviderTest.php
# tests/Sentry/ServiceProviderTest.php
# tests/Telescope/TelescopeServiceProviderTest.php428 files changed
Lines changed: 8003 additions & 2293 deletions
File tree
- docs/plans
- src
- auth/src
- Notifications
- Passwords
- broadcasting/src
- bus/src
- cache/src
- Redis/Console
- console/src
- contracts/src/Queue
- cookie/src
- database/src
- Console
- Migrations
- docs
- fortify
- config
- routes
- src
- stubs
- foundation
- config
- resources/exceptions/renderer/components
- src
- Bootstrap
- Console
- Exceptions
- Http
- Middleware
- Testing
- Concerns
- resources
- hashing/src
- horizon
- config
- resources/views
- src
- Connectors
- Console
- Http/Controllers
- Listeners
- Notifications
- Repositories
- http/src
- Middleware
- inertia
- config
- src
- Commands
- Ssr
- Testing
- jwt
- config
- src
- mail
- resources/views
- html
- text
- src
- notifications/resources/views
- passkeys
- config
- routes
- src
- permission
- config
- database/migrations
- src
- Commands
- Support
- queue/src
- Connectors
- Console
- Jobs
- rate-limiter/src
- redis/src
- Pool
- reverb
- config
- src
- Protocols/Pusher
- Channels
- Concerns
- Http/Controllers
- Servers/Hypervel
- Webhooks
- Jobs
- saloon
- config
- src
- sanctum
- config
- src
- Console/Commands
- Http/Middleware
- scout
- config
- src
- Console
- Engines
- sentry
- config
- src
- Aspects
- Features
- Http
- Tracing
- server/src/Commands
- signal/src
- support/src
- telescope
- config
- database/migrations
- resources/views
- src
- Http/Controllers
- Storage
- Watchers
- testbench
- hypervel
- config
- src
- Bootstrap
- Concerns
- Workbench
- tinker
- config
- src/Console
- tests
- Auth
- Cache/Redis/Console
- Console
- Commands
- Database
- Fortify
- Console
- Foundation
- Bootstrap
- Console
- Fixtures
- config
- envs
- Testing
- Concerns
- Hashing
- Horizon
- Console
- Unit
- Inertia
- Commands
- Testing
- Integration
- Auth
- Redis
- Broadcasting
- Database
- Foundation
- Console
- Support/Providers
- Testing/Concerns
- Horizon
- Controller
- Feature
- Listeners
- Http
- Middleware
- Mail
- Fixtures
- Queue
- Redis
- Reverb
- Session/Database/Sqlite
- Jwt
- Mail
- Passkeys
- Feature
- Permission
- Integration
- Support
- Traits
- Queue
- RateLimiter
- Redis
- Fixtures
- Reverb
- Protocols/Pusher
- Channels
- Servers/Hypervel
- Webhooks
- Jobs
- Saloon
- Http
- Sanctum
- Scout/Unit
- Console
- Sentry
- Aspects
- EventHandler
- Features
- Tracing
- Session
- Middleware
- Support
- Telescope
- Http
- Telescope
- Watchers
- Testbench
- Concerns
- Exceptions
- Workbench
- Tinker
- Watcher
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
195 | 195 | | |
196 | 196 | | |
197 | 197 | | |
198 | | - | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
199 | 211 | | |
200 | 212 | | |
201 | | - | |
202 | 213 | | |
203 | 214 | | |
204 | 215 | | |
| |||
729 | 740 | | |
730 | 741 | | |
731 | 742 | | |
732 | | - | |
| 743 | + | |
733 | 744 | | |
734 | 745 | | |
735 | 746 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
474 | 474 | | |
475 | 475 | | |
476 | 476 | | |
477 | | - | |
| 477 | + | |
478 | 478 | | |
479 | 479 | | |
480 | 480 | | |
| |||
0 commit comments