Permalink
Commits on Oct 19, 2018
  1. Merge branch '4.1'

    javiereguiluz committed Oct 19, 2018
    * 4.1:
      fixed use statement
  2. Fixed a template path

    javiereguiluz committed Oct 19, 2018
  3. Merge branch '3.4' into 4.1

    javiereguiluz committed Oct 19, 2018
    * 3.4:
      Fix base.html.twig path
  4. minor #10522 Fix base.html.twig path (quentint)

    javiereguiluz committed Oct 19, 2018
    This PR was merged into the 3.4 branch.
    
    Discussion
    ----------
    
    Fix base.html.twig path
    
    To match Symfony 3.4 structure, as seen here: https://symfony.com/doc/3.4/templating.html
    
    Commits
    -------
    
    b572928 Fix base.html.twig path
  5. minor #10518 fixed use statement (OskarStark)

    javiereguiluz committed Oct 19, 2018
    This PR was merged into the 4.1 branch.
    
    Discussion
    ----------
    
    fixed use statement
    
    <!--
    
    If your pull request fixes a BUG, use the oldest maintained branch that contains
    the bug (see https://symfony.com/roadmap for the list of maintained branches).
    
    If your pull request documents a NEW FEATURE, use the same Symfony branch where
    the feature was introduced (and `master` for features of unreleased versions).
    
    -->
    
    Commits
    -------
    
    9cdd4ad fixed use statement
  6. Merge branch '4.1'

    javiereguiluz committed Oct 19, 2018
    * 4.1:
      Removed an unnecessary (and outdated) reference
      fix spacing
  7. Merge branch '3.4' into 4.1

    javiereguiluz committed Oct 19, 2018
    * 3.4:
      Removed an unnecessary (and outdated) reference
      fix spacing
  8. Merge branch '2.8' into 3.4

    javiereguiluz committed Oct 19, 2018
    * 2.8:
      Removed an unnecessary (and outdated) reference
  9. minor #10524 Removed an unnecessary (and outdated) reference (javiere…

    javiereguiluz committed Oct 19, 2018
    …guiluz)
    
    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    Removed an unnecessary (and outdated) reference
    
    Fixes the error discussed in #10518.
    
    Commits
    -------
    
    ab3a59e Removed an unnecessary (and outdated) reference
  10. Fix base.html.twig path

    quentint committed Oct 19, 2018
    To match Symfony 3.4 structure, as seen here: https://symfony.com/doc/3.4/templating.html
  11. minor #10519 fix spacing (JarJak)

    javiereguiluz committed Oct 19, 2018
    This PR was merged into the 3.4 branch.
    
    Discussion
    ----------
    
    fix spacing
    
    Commits
    -------
    
    7b6b0b6 fix spacing
  12. fix spacing

    JarJak committed Oct 19, 2018
  13. fixed use statement

    OskarStark committed Oct 19, 2018
  14. Merge branch '4.1'

    javiereguiluz committed Oct 19, 2018
    * 4.1:
      Mentioned the new file upload exception classes
      Fixing bad logic, caused by merge originally
      Update docs now that sessions are enabled automatically
      Mentioned user_checkers in the main security config reference
      If multiple guard authenticators have different providers, link to the details on chaining providers together.
  15. Merge branch '3.4' into 4.1

    javiereguiluz committed Oct 19, 2018
    * 3.4:
      Fixing bad logic, caused by merge originally
      Mentioned user_checkers in the main security config reference
      If multiple guard authenticators have different providers, link to the details on chaining providers together.
  16. Merge branch '2.8' into 3.4

    javiereguiluz committed Oct 19, 2018
    * 2.8:
      Mentioned user_checkers in the main security config reference
      If multiple guard authenticators have different providers, link to the details on chaining providers together.
  17. minor #10509 Mentioned user_checkers in the main security config refe…

    javiereguiluz committed Oct 19, 2018
    …rence (javiereguiluz)
    
    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    Mentioned user_checkers in the main security config reference
    
    This fixes #7259.
    
    Commits
    -------
    
    8b99e58 Mentioned user_checkers in the main security config reference
  18. Minor code refactor

    javiereguiluz committed Oct 19, 2018
  19. minor #10516 Fixing bad logic, caused by merge originally (weaverryan)

    javiereguiluz committed Oct 19, 2018
    This PR was merged into the 3.4 branch.
    
    Discussion
    ----------
    
    Fixing bad logic, caused by merge originally
    
    Caught by @fnash in Symfony Slack! Because the `supports()` method didn't exist in 2.8, this logic basically needed to be reversed when we merged to 3.4. But, that was not done correctly (by me).
    
    Commits
    -------
    
    4e473c0 Fixing bad logic, caused by merge originally
  20. minor #10517 fix small typo in form login docs. (EliuTimana)

    javiereguiluz committed Oct 19, 2018
    This PR was merged into the 4.1 branch.
    
    Discussion
    ----------
    
    fix small typo in form login docs.
    
    Commits
    -------
    
    3ed0548 fix small typo in form login docs.
  21. minor #10510 Update docs now that sessions are enabled automatically …

    javiereguiluz committed Oct 19, 2018
    …(javiereguiluz)
    
    This PR was merged into the 4.1 branch.
    
    Discussion
    ----------
    
    Update docs now that sessions are enabled automatically
    
    Fixes #8990.
    
    Commits
    -------
    
    c95ae39 Update docs now that sessions are enabled automatically
  22. minor #10512 Mentioned the new file upload exception classes (javiere…

    javiereguiluz committed Oct 19, 2018
    …guiluz)
    
    This PR was squashed before being merged into the 4.1 branch (closes #10512).
    
    Discussion
    ----------
    
    Mentioned the new file upload exception classes
    
    Fixes #9642.
    
    Commits
    -------
    
    1ea6d88 Mentioned the new file upload exception classes
  23. minor #10513 Fixed minor syntax issues (javiereguiluz)

    javiereguiluz committed Oct 19, 2018
    This PR was merged into the 4.1 branch.
    
    Discussion
    ----------
    
    Fixed minor syntax issues
    
    This formatting is not supported by RST. See:
    
    ![wrong-syntax](https://user-images.githubusercontent.com/73419/47156464-7c54a300-d2e7-11e8-852d-51f8b63c968e.png)
    
    Commits
    -------
    
    77af770 Fixed minor syntax issues
Commits on Oct 18, 2018
  1. Fixing bad logic, caused by merge originally

    weaverryan committed Oct 18, 2018
  2. Minor reword

    javiereguiluz committed Oct 18, 2018
  3. minor #10511 [FormType] Add help_attr documentation (mpiot)

    javiereguiluz committed Oct 18, 2018
    This PR was squashed before being merged into the master branch (closes #10511).
    
    Discussion
    ----------
    
    [FormType] Add help_attr documentation
    
    Add documentation about the new feature symfony/symfony#27043
    
    Commits
    -------
    
    f6162bc [FormType] Add help_attr documentation
  4. minor #10508 Fix typo (ianmustafa)

    javiereguiluz committed Oct 18, 2018
    This PR was merged into the 4.1 branch.
    
    Discussion
    ----------
    
    Fix typo
    
    <!--
    
    If your pull request fixes a BUG, use the oldest maintained branch that contains
    the bug (see https://symfony.com/roadmap for the list of maintained branches).
    
    If your pull request documents a NEW FEATURE, use the same Symfony branch where
    the feature was introduced (and `master` for features of unreleased versions).
    
    -->
    
    Commits
    -------
    
    8b4a3fe Fix typo