Skip to content

Commit f05ec91

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: Remove comment about PR draft status Fixed small typo
2 parents 6b5da38 + 5d9a064 commit f05ec91

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

contributing/code/pull_requests.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,7 @@ because you want early feedback on your work, add an item to todo-list:
370370
- [ ] gather feedback for my changes
371371
372372
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]".
375374

376375
In the pull request description, give as much detail as possible about your
377376
changes (don't hesitate to give code examples to illustrate your points). If
@@ -436,4 +435,3 @@ before merging.
436435
.. _`searching on GitHub`: https://github.com/symfony/symfony/issues?q=+is%3Aopen+
437436
.. _`Symfony Slack`: https://symfony.com/slack-invite
438437
.. _`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

testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ submitting a login form - make a test very slow. For this reason, Symfony
607607
provides a ``loginUser()`` method to simulate logging in in your functional
608608
tests.
609609

610-
Instead of login in with real users, it's recommended to create a user only for
610+
Instead of logging in with real users, it's recommended to create a user only for
611611
tests. You can do that with Doctrine :ref:`data fixtures <user-data-fixture>`,
612612
to load the testing users only in the test database.
613613

0 commit comments

Comments
 (0)