Skip to content

Commit cd74b5c

Browse files
committed
Merge branch '4.2'
2 parents 0174746 + 5b3e3ac commit cd74b5c

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

pagination.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ There are several ways to paginate items. The simplest is by using the `paginate
2222

2323
$users = DB::table('users')->paginate(15);
2424

25+
> **Note:** Currently, pagination operations that use a `groupBy` statement cannot be executed efficiently by Laravel. If you need to use a `groupBy` with a paginated result set, it is recommended that you query the database manually and use `Paginator::make`.
26+
2527
#### Paginating An Eloquent Model
2628

2729
You may also paginate [Eloquent](/docs/eloquent) models:

schema.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ Command | Description
8787
`$table->time('sunrise');` | TIME equivalent to the table
8888
`$table->timestamp('added_on');` | TIMESTAMP equivalent to the table
8989
`$table->timestamps();` | Adds **created\_at** and **updated\_at** columns
90+
`$table->rememberToken();` | Adds `remember_token` as VARCHAR(100) NULL
9091
`->nullable()` | Designate that the column allows NULL values
9192
`->default($value)` | Declare a default value for a column
9293
`->unsigned()` | Set INTEGER to UNSIGNED

security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ By default, Laravel includes a `User` model in your `app/models` directory which
1919

2020
If your application is not using Eloquent, you may use the `database` authentication driver which uses the Laravel query builder.
2121

22-
> **Note:** Before getting started, make sure that your `users` (or equivalent) table contains a nullable, string `remember_token` column of 100 characters. This column will be used to store a token for "remember me" sessions being maintained by your application.
22+
> **Note:** Before getting started, make sure that your `users` (or equivalent) table contains a nullable, string `remember_token` column of 100 characters. This column will be used to store a token for "remember me" sessions being maintained by your application. This can be done by using `$table->rememberToken();` in a migration.
2323
2424
<a name="storing-passwords"></a>
2525
## Storing Passwords

0 commit comments

Comments
 (0)