Skip to content

Commit 70babb5

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Replace duplicate medium configuration Update git protocol in URL Tell about COMPOSER_ROOT_VERSION when not working on the default branch
2 parents ceaadad + 80a2dab commit 70babb5

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

contributing/code/tests.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@ tests, such as Doctrine, Twig and Monolog. To do so,
2424
2525
$ composer update
2626
27+
.. tip::
28+
29+
Dependencies might fail to update and in this case Composer might need you to
30+
tell it what Symfony version you are working on.
31+
To do so set ``COMPOSER_ROOT_VERSION`` variable, e.g.:
32+
33+
.. code-block:: terminal
34+
35+
$ COMPOSER_ROOT_VERSION=4.4.x-dev composer update
36+
2737
.. _running:
2838

2939
Running the Tests

contributing/documentation/overview.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ this value accordingly):
7676
.. code-block:: terminal
7777
7878
$ cd projects/
79-
$ git clone git://github.com/YOUR-GITHUB-USERNAME/symfony-docs.git
79+
$ git clone git@github.com:YOUR-GITHUB-USERNAME/symfony-docs.git
8080
8181
**Step 3.** Add the original Symfony docs repository as a "Git remote" executing
8282
this command:

notifier.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ specify what channels should be used for specific levels (using
555555
->channelPolicy('high', ['chat/slack'])
556556
// Use browser for medium and low notifications
557557
->channelPolicy('medium', ['browser'])
558-
->channelPolicy('medium', ['browser'])
558+
->channelPolicy('low', ['browser'])
559559
;
560560
};
561561

0 commit comments

Comments
 (0)