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

[5.x] Changes to User role methods #9921

Merged
merged 13 commits into from
Apr 24, 2024
Merged

[5.x] Changes to User role methods #9921

merged 13 commits into from
Apr 24, 2024

Commits on Apr 17, 2024

  1. Return a user's roles via groups from User@roles. Let's see what br… 

    …eaks.
    @duncanmcclean
    duncanmcclean committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    70b427e View commit details
    Browse the repository at this point in the history

  2. filter out items after merging

    @duncanmcclean
    duncanmcclean committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    562c226 View commit details
    Browse the repository at this point in the history

  3. actually, just merge stuff in the hasRole method, keep things as th… 

    …ey are in the "main" `getRoles` method
    @duncanmcclean
    duncanmcclean committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    090e7e8 View commit details
    Browse the repository at this point in the history

  4. fix test

    @duncanmcclean
    duncanmcclean committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    018d29e View commit details
    Browse the repository at this point in the history

  5. copy change to eloquent user

    @duncanmcclean
    duncanmcclean committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    94f27be View commit details
    Browse the repository at this point in the history

  6. Fix styling

    @duncanmcclean @github-actions
    duncanmcclean authored and github-actions[bot] committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    b7d117a View commit details
    Browse the repository at this point in the history

  7. get rid of it on the eloquent user too

    @duncanmcclean
    duncanmcclean committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    00b840f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'role-group-tweaks' of github.com:statamic/cms into role… 

    …-group-tweaks
    @duncanmcclean
    duncanmcclean committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    e85b6fc View commit details
    Browse the repository at this point in the history

  9. Fix styling

    @duncanmcclean @github-actions
    duncanmcclean authored and github-actions[bot] committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    b65882c View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. flip flop back to hasRole not doing any merging

    @duncanmcclean
    duncanmcclean committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    fda2da3 View commit details
    Browse the repository at this point in the history

  2. Split up merged roles and explicit roles into different methods

    @duncanmcclean
    duncanmcclean committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    18f5ea9 View commit details
    Browse the repository at this point in the history

  3. tweak assertions

    @duncanmcclean
    duncanmcclean committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    574fdfd View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Merge branch 'master' into role-group-tweaks

    @jasonvarga
    jasonvarga committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    47ceef3 View commit details
    Browse the repository at this point in the history