Commitf05ec91

committed

Merge branch '5.2' into 5.x

* 5.2: Remove comment about PR draft status Fixed small typo

2 parents6b5da38 +5d9a064 commitf05ec91Copy full SHA for f05ec91

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -370,8 +370,7 @@ because you want early feedback on your work, add an item to todo-list:`
`370`	`370`	`- [ ] gather feedback for my changes`
`371`	`371`
`372`	`372`	`As long as you have items in the todo-list, please prefix the pull request`
`373`		`-title with "[WIP]". If you do not yet want to trigger the automated tests,`
`374`		-you can also set the PR to `draft status`_.
	`373`	`+title with "[WIP]".`
`375`	`374`
`376`	`375`	`In the pull request description, give as much detail as possible about your`
`377`	`376`	`changes (don't hesitate to give code examples to illustrate your points). If`
`@@ -436,4 +435,3 @@ before merging.`
`436`	`435`	.. _`searching on GitHub`:https://github.com/symfony/symfony/issues?q=+is%3Aopen+
`437`	`436`	.. _`Symfony Slack`:https://symfony.com/slack-invite
`438`	`437`	.. _`Travis-CI`:https://travis-ci.org/symfony/symfony
`439`		-.. _`draft status`:https://help.github.com/github/collaborating-with-issues-and-pull-requests/about-pull-requests#draft-pull-requests

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@ submitting a login form - make a test very slow. For this reason, Symfony`
`607`	`607`	provides a ``loginUser()`` method to simulate logging in in your functional
`608`	`608`	`tests.`
`609`	`609`
`610`		`-Instead oflogin in with real users, it's recommended to create a user only for`
	`610`	`+Instead oflogging in with real users, it's recommended to create a user only for`
`611`	`611`	tests. You can do that with Doctrine:ref:`data fixtures<user-data-fixture>`,
`612`	`612`	`to load the testing users only in the test database.`
`613`	`613`

Comments

(0)