Andrew Miller
0baa2e7794
Change indent for package.json from 2 to 4 spaces
...
Minor style issue more than anything.
If using `php artisan preset` it will use PHP's `JSON_PRETTY_PRINT` to rewrite the file (https://github.com/laravel/framework/blob/master/src/Illuminate/Foundation/Console/Presets/Preset.php#L44 ). `JSON_PRETTY_PRINT` uses four spaces for indentation, causing the entire file contents to be altered upon a diff.
Rather than adding logic to change the indentation after executing `json_encode()` in `Illuminate\Foundation\Console\Presets\Preset`, it seems easier to just fix the default indentation in `package.json`. NPM doesn't seem to change the spacing at all, so this seems like a happy medium.
2017-08-14 22:34:23 +09:00
Taylor Otwell
58ed5459b1
Merge pull request #4373 from marcusmoore/patch-2
...
update example unit test to use RefreshDatabase trait
2017-08-12 20:43:56 -05:00
Marcus Moore
faa3d2fa34
update example unit test to use RefreshDatabase trait
2017-08-12 18:21:49 -07:00
Taylor Otwell
be143bf2dc
Merge pull request #4364 from tomirons/patch-1
...
[5.5] add whoops to dev dependencies
2017-08-06 08:50:48 -05:00
Tom Irons
c542d0ba3d
add whoops to dev dependencies
2017-08-05 15:55:03 -04:00
Taylor Otwell
7bcf7a5450
Merge pull request #4344 from djh101/develop
...
Fixed trailing slash redirection for subdirectory installs.
2017-07-23 06:35:09 -05:00
Drew
c5f993fa28
Fixed trailing slash redirection for subdirectory installs.
...
Previously redirection to remove trailing slashes would fail if Laravel was not installed in the root directory.
2017-07-23 00:35:36 -07:00
Taylor Otwell
134eafd12c
remove things that aren't usually customized
2017-07-19 17:45:57 -05:00
Taylor Otwell
396634857e
use exception status
2017-07-19 17:26:48 -05:00
Taylor Otwell
c2e3cb9065
tweak default handler
2017-07-19 16:21:03 -05:00
Taylor Otwell
ebc18e3aef
update comment
2017-07-17 09:12:08 -05:00
Taylor Otwell
5d54c21ea8
auto loads commands
2017-07-17 09:11:10 -05:00
Taylor Otwell
c4e142867c
Merge pull request #4333 from DCzajkowski/develop
...
Fixed CI
2017-07-15 14:25:50 -05:00
DCzajkowski
1270a0b3a2
Fixed CI
2017-07-15 19:48:06 +02:00
Taylor Otwell
fef413ff0e
remove predis
2017-07-12 11:58:52 -05:00
Taylor Otwell
51f7e188a1
remove file
2017-07-12 11:58:33 -05:00
Taylor Otwell
1e4f3b9920
remove lock
2017-07-11 16:53:34 -05:00
Taylor Otwell
255c2bf1b7
Merge branch 'develop' of github.com:laravel/laravel into develop
2017-07-11 16:53:11 -05:00
Taylor Otwell
d75800052d
change default
2017-07-11 16:53:04 -05:00
Taylor Otwell
560bde8eb1
wip
2017-07-11 15:28:02 -05:00
Taylor Otwell
9a276e4ef5
wip
2017-07-11 15:25:52 -05:00
Taylor Otwell
e109f4fcb0
wip
2017-07-11 15:24:40 -05:00
Taylor Otwell
d0ce75926f
Merge branch 'master' into develop
2017-07-11 13:26:38 -05:00
Taylor Otwell
8999e8745e
tweak method
2017-07-06 12:28:57 -05:00
Taylor Otwell
cec1b1bf94
fix error code
2017-07-06 12:27:35 -05:00
Taylor Otwell
4611d2bf31
stub listeners property
2017-07-06 12:08:40 -05:00
Taylor Otwell
3310063b59
add validation to exception handler
2017-07-06 11:49:51 -05:00
Taylor Otwell
098b8a4883
Merge pull request #4322 from kauhat/patch-1
...
Ignore the Yarn error log
2017-07-04 11:54:53 -05:00
Jack Fletcher
12db505122
Ignore the Yarn error log
...
Like the npm error log, this file can also be ignored.
[See also](https://stackoverflow.com/questions/42592168/should-i-add-yarn-error-log-to-my-gitignore-file )
2017-07-04 15:25:06 +01:00
Taylor Otwell
8d370ce7f2
Merge pull request #4311 from lucasmichot/feature/master/docblock
...
[5.4] Fix docblock.
2017-07-03 08:01:54 -05:00
Lucas Michot
8ceb2fddb7
Fix docblock.
2017-07-03 11:17:19 +02:00
Taylor Otwell
df5b100521
formatting
2017-06-29 13:36:21 -05:00
Yitzchok Willroth
28719679b7
🔧 Slugify new session.cookie to comply with RFC 6265.
2017-06-29 13:42:31 -04:00
Yitzchok Willroth
a7f2c060b2
🔧 🔧 Reduce discoverability of session cookie name.
...
Derives session.cookie from SESSION_COOKIE, falling back to (snake_cased) APP_NAME . '_session', falling back to 'laravel_session' (current) in order to make it less discoverable, thereby (slightly) reducing threat vector.
2017-06-29 12:12:19 -04:00
Taylor Otwell
d5bf06589f
Merge pull request #4302 from bretterer/fix_trusted_proxies
...
Fix to TrustProxies
2017-06-29 07:27:14 -05:00
Brian Retterer
c9e47da895
Changes header keys for TrustProxies to non deprecated version
2017-06-28 17:52:56 -04:00
Taylor Otwell
9fec341e55
Merge pull request #4299 from lucasmichot/feature/master/npm-packages
...
Upgrade axios and cross-env packages
2017-06-27 08:35:21 -05:00
Lucas Michot
436581afd2
Upgrade axios and cross-env.
2017-06-27 11:05:42 +02:00
Taylor Otwell
5ae7c373fe
Merge pull request #4294 from ovanschie/patch-1
...
Require Laravel Mix 1.0
2017-06-21 14:12:39 -05:00
Olav van Schie
b9ca228f86
Require Laravel Mix 1.0
2017-06-21 17:05:19 +02:00
Taylor Otwell
3acb739450
Merge pull request #4287 from laravel/top-secret-add-quotes-patch
...
Add quotes
2017-06-06 09:17:07 -05:00
Jeffrey Way
4569aebc18
Add quotes
...
Sass compilers can sometimes be weird if import urls like this aren't quoted. They'll spit out junk like
```
Error: Encountered invalid @import syntax.
```
Anyways, pretty common practice to use quotes for all imports. I mean, seriously, how much more do you want me to write for a dang PR that adds a pair of quotes? I've got work to do, gah.
2017-06-06 09:49:05 -04:00
Taylor Otwell
e50ca3dc87
Merge pull request #4283 from laravel/mix-patch
...
Simplify mix require
2017-06-01 15:13:26 -05:00
Taylor Otwell
4247988ed9
Update webpack.mix.js
2017-06-01 15:13:18 -05:00
Jeffrey Way
7311c32bc3
Simplify mix require
...
Note that I left your dang `const` as it is, even though it's stupid. `let` for life. 💃 💃 💃 💃
2017-06-01 13:26:02 -04:00
Taylor Otwell
6db0f350fb
no longer needed with autodiscovery
2017-06-01 11:39:13 -05:00
Taylor Otwell
2f4d72699c
update composer json
2017-06-01 11:26:43 -05:00
Taylor Otwell
a9268c5f58
Merge pull request #4282 from m1guelpf/patch-1
...
Dynamic changing locale
2017-05-30 07:58:28 -05:00
Miguel Piedrafita
ed82e6704d
See https://github.com/laravel/framework/pull/19405
2017-05-30 14:55:00 +02:00
Taylor Otwell
1a32543c09
Merge pull request #4279 from adiachenko/testsuite_names
...
Simplify test suite names
2017-05-27 20:27:55 -05:00