Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge 2.x => 3.x #1003

Merged
merged 5 commits into from
Sep 13, 2024
Merged

merge 2.x => 3.x #1003

merged 5 commits into from
Sep 13, 2024

Commits on Apr 26, 2024

  1. Correct asserted view code

    @ravage84
    ravage84 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    aaa021a View commit details
    Browse the repository at this point in the history

  2. Skip test case that behaves differently with older CakePHP versions

    @ravage84
    ravage84 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    b4167f8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #986 from cakephp/2.x-assert-nick 

    [2.x] Correct asserted view code
    @dereuromark
    dereuromark committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7d7c919 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Merge branch '2.x' into 3.x-merge 

    # Conflicts:
#	tests/comparisons/Template/testBakeView.php
    @LordSimal
    LordSimal committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    99d7655 View commit details
    Browse the repository at this point in the history

  2. remove version check in tests

    @LordSimal
    LordSimal committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    46ecd86 View commit details
    Browse the repository at this point in the history